[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza I18NStrings.properties, 1.1, 1.2 NetezzaPlugin.java, 1.1, 1.2

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22539/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza

Modified Files:
	I18NStrings.properties NetezzaPlugin.java 
Log Message:
Added source tab for synonyms and stored procedures.  Can now properly tokenize scripts that contain stored proc statements with the plugin.

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/I18NStrings.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** I18NStrings.properties	25 Dec 2009 03:02:36 -0000	1.1
--- I18NStrings.properties	28 Dec 2009 23:43:01 -0000	1.2
***************
*** 1,6 ****
  
  
- 
- NetezzaPlugin.viewSourceTabHint=Shows the source of the selected view
- 
  NetezzaPlugin.prefsHint=Preferences for Netezza
\ No newline at end of file
--- 1,3 ----

Index: NetezzaPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/NetezzaPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetezzaPlugin.java	25 Dec 2009 03:02:36 -0000	1.1
--- NetezzaPlugin.java	28 Dec 2009 23:43:01 -0000	1.2
***************
*** 37,43 ****
--- 37,47 ----
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
  import net.sourceforge.squirrel_sql.plugins.netezza.exp.NetezzaSequenceInodeExpanderFactory;
+ import net.sourceforge.squirrel_sql.plugins.netezza.exp.NetezzaSynonymInodeExpanderFactory;
  import net.sourceforge.squirrel_sql.plugins.netezza.prefs.NetezzaPreferenceBean;
  import net.sourceforge.squirrel_sql.plugins.netezza.tab.ProcedureSourceTab;
+ import net.sourceforge.squirrel_sql.plugins.netezza.tab.SynonymDetailsTab;
+ import net.sourceforge.squirrel_sql.plugins.netezza.tab.SynonymSourceTab;
  import net.sourceforge.squirrel_sql.plugins.netezza.tab.ViewSourceTab;
+ import net.sourceforge.squirrel_sql.plugins.netezza.tokenizer.NetezzaQueryTokenizer;
  
  /**
***************
*** 57,67 ****
  	
  	static interface i18n
! 	{
! 		// i18n[NetezzaPlugin.viewSourceTabHint=Shows the source of the selected view]
! 		String VIEW_SOURCE_TAB_HINT = s_stringMgr.getString("NetezzaPlugin.viewSourceTabHint");
! 		
  		// i18n[NetezzaPlugin.prefsHint=Preferences for Netezza]
  		String PREFS_HINT = s_stringMgr.getString("NetezzaPlugin.prefsHint");
- 		
  	}
  
--- 61,67 ----
  	
  	static interface i18n
! 	{		
  		// i18n[NetezzaPlugin.prefsHint=Preferences for Netezza]
  		String PREFS_HINT = s_stringMgr.getString("NetezzaPlugin.prefsHint");
  	}
  
***************
*** 127,130 ****
--- 127,133 ----
  			return null;
  		}
+ 		
+ 		session.setQueryTokenizer(new NetezzaQueryTokenizer(_prefsManager.getPreferences()));
+ 		
  		GUIUtils.processOnSwingEventThread(new Runnable() {
  
***************
*** 142,157 ****
  	private void updateObjectTree(final IObjectTreeAPI objTree)
  	{
! 		objTree.addDetailTab(DatabaseObjectType.PROCEDURE, new DatabaseObjectInfoTab());
! 		objTree.addDetailTab(DatabaseObjectType.PROCEDURE, new ProcedureSourceTab(i18n.VIEW_SOURCE_TAB_HINT, ";"));
! 		objTree.addDetailTab(DatabaseObjectType.SEQUENCE, new DatabaseObjectInfoTab());
! 		objTree.addDetailTab(DatabaseObjectType.VIEW, new DatabaseObjectInfoTab());
! 		objTree.addDetailTab(DatabaseObjectType.VIEW, new ViewSourceTab(i18n.VIEW_SOURCE_TAB_HINT, ";"));
! 		
  		
  		// ////// Object Tree Expanders ////////
! 		// Schema Expanders - sequence
  		objTree.addExpander(DatabaseObjectType.SCHEMA, 
  			new SchemaExpander(new NetezzaSequenceInodeExpanderFactory(), DatabaseObjectType.SEQUENCE));
! 				
  	}
  
--- 145,173 ----
  	private void updateObjectTree(final IObjectTreeAPI objTree)
  	{
! 		String stmtSep = _prefsManager.getPreferences().getStatementSeparator();
  		
  		// ////// Object Tree Expanders ////////
! 
! 		// Schema Expander - sequences
  		objTree.addExpander(DatabaseObjectType.SCHEMA, 
  			new SchemaExpander(new NetezzaSequenceInodeExpanderFactory(), DatabaseObjectType.SEQUENCE));
! 
! 		// Schema Expander - synonyms
! 		objTree.addExpander(DatabaseObjectType.SCHEMA, 
! 			new SchemaExpander(new NetezzaSynonymInodeExpanderFactory(), DatabaseObjectType.SYNONYM));
! 
! 		
! 		// ////// Object Tree Detail Tabs ////////
! 		objTree.addDetailTab(DatabaseObjectType.PROCEDURE, new ProcedureSourceTab(stmtSep));
! 		
! 		// Netezza data dictionary lacks sequence details needed for a details tab or a source tab.
! 		objTree.addDetailTab(DatabaseObjectType.SEQUENCE, new DatabaseObjectInfoTab());
! 		
! 		objTree.addDetailTab(DatabaseObjectType.SYNONYM, new DatabaseObjectInfoTab());
! 		objTree.addDetailTab(DatabaseObjectType.SYNONYM, new SynonymDetailsTab());
! 		objTree.addDetailTab(DatabaseObjectType.SYNONYM, new SynonymSourceTab(stmtSep));
! 		
! 		objTree.addDetailTab(DatabaseObjectType.VIEW, new DatabaseObjectInfoTab());
! 		objTree.addDetailTab(DatabaseObjectType.VIEW, new ViewSourceTab(stmtSep));
  	}