[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session I18NStrings.properties,1.18,1.19 ISession.java,1.25,1.26 SQLExecuterTask.java,1.28,1.29 Session.java,1.44,1.45 CaseInsensitiveString.java,1.2,NONE SchemaInfo.java,1.30,NONE SchemaInfoUpdateCheck.java,1.2,NONE SchemaInfoUpdateListener.java,1.1,NONE

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22747/app/src/net/sourceforge/squirrel_sql/client/session

Modified Files:
	I18NStrings.properties ISession.java SQLExecuterTask.java 
	Session.java 
Removed Files:
	CaseInsensitiveString.java SchemaInfo.java 
	SchemaInfoUpdateCheck.java SchemaInfoUpdateListener.java 
Log Message:
Refactoring and fixed bugs in error and syntax highlighting

--- CaseInsensitiveString.java DELETED ---

Index: Session.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/Session.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Session.java	19 Apr 2006 07:55:32 -0000	1.44
--- Session.java	3 May 2006 10:49:38 -0000	1.45
***************
*** 52,55 ****
--- 52,56 ----
  import net.sourceforge.squirrel_sql.client.session.parser.ParserEventsProcessor;
  import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
+ import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo;
  import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
  import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
***************
*** 122,126 ****
  
  	/** Xref info about the current connection. */
! 	private final SchemaInfo _schemaInfo;
  
     /** Set to <TT>true</TT> once session closed. */
--- 123,127 ----
  
  	/** Xref info about the current connection. */
! 	private final net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo _schemaInfo;
  
     /** Set to <TT>true</TT> once session closed. */

Index: ISession.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ISession.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ISession.java	23 Mar 2006 13:03:59 -0000	1.25
--- ISession.java	3 May 2006 10:49:38 -0000	1.26
***************
*** 40,43 ****
--- 40,44 ----
  import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
  import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
+ 
  /**
   * The current session.
***************
*** 47,138 ****
  
     public interface IMainPanelTabIndexes extends MainPanel.ITabIndexes
! 	{
! 		// Empty body.
! 	}
  
! 	/**
! 	 * Retrieve whether this session has been closed.
! 	 *
! 	 * @return	<TT>true</TT> if session closed else <TT>false</TT>.
! 	 */
! 	boolean isClosed();
  
! 	/**
! 	 * Return the Application API object.
! 	 *
! 	 * @return the Application API object.
! 	 */
! 	IApplication getApplication();
  
! 	/**
! 	 * Return the current SQL connection object.
! 	 *
! 	 * @return the current SQL connection object.
! 	 */
! 	SQLConnection getSQLConnection();
  
! 	/**
! 	 * Return the driver used to connect to the database.
! 	 *
! 	 * @return the driver used to connect to the database.
! 	 */
! 	ISQLDriver getDriver();
  
! 	/**
! 	 * Return the alias used to connect to the database.
! 	 *
! 	 * @return the alias used to connect to the database.
! 	 */
! 	ISQLAlias getAlias();
  
! 	/**
! 	 * Return the properties for this session.
! 	 *
! 	 * @return the properties for this session.
! 	 */
! 	SessionProperties getProperties();
  
!  	/**
! 	 * Commit the current SQL session.
! 	 */
! 	void commit();
  
! 	/**
! 	 * Rollback the current SQL session.
! 	 */
! 	void rollback();
  
! 	/**
! 	 * Close this session.
! 	 *
! 	 * @throws	SQLException
! 	 * 			Thrown if an error closing the SQL connection. The session
! 	 * 			will still be closed even though the connection may not have
! 	 *			been.
! 	 */
! 	void close() throws SQLException;
  
! 	/**
! 	 * Close the current connection to the database.
! 	 *
! 	 * @throws	SQLException	if an SQL error occurs.
! 	 */
! 	void closeSQLConnection() throws SQLException;
  
     void setSessionInternalFrame(SessionInternalFrame sif);
  
! 	/**
! 	 * Reconnect to the database.
! 	 */
! 	void reconnect();
  
! 	Object getPluginObject(IPlugin plugin, String key);
! 	Object putPluginObject(IPlugin plugin, String key, Object obj);
! 	void removePluginObject(IPlugin plugin, String key);
  
! 	void setMessageHandler(IMessageHandler handler);
! 	IMessageHandler getMessageHandler();
  
! 	SessionPanel getSessionSheet();
  
     SessionInternalFrame getSessionInternalFrame();
--- 48,139 ----
  
     public interface IMainPanelTabIndexes extends MainPanel.ITabIndexes
!    {
!       // Empty body.
!    }
  
!    /**
!     * Retrieve whether this session has been closed.
!     *
!     * @return	<TT>true</TT> if session closed else <TT>false</TT>.
!     */
!    boolean isClosed();
  
!    /**
!     * Return the Application API object.
!     *
!     * @return the Application API object.
!     */
!    IApplication getApplication();
  
!    /**
!     * Return the current SQL connection object.
!     *
!     * @return the current SQL connection object.
!     */
!    SQLConnection getSQLConnection();
  
!    /**
!     * Return the driver used to connect to the database.
!     *
!     * @return the driver used to connect to the database.
!     */
!    ISQLDriver getDriver();
  
!    /**
!     * Return the alias used to connect to the database.
!     *
!     * @return the alias used to connect to the database.
!     */
!    ISQLAlias getAlias();
  
!    /**
!     * Return the properties for this session.
!     *
!     * @return the properties for this session.
!     */
!    SessionProperties getProperties();
  
!     /**
!     * Commit the current SQL session.
!     */
!    void commit();
  
!    /**
!     * Rollback the current SQL session.
!     */
!    void rollback();
  
!    /**
!     * Close this session.
!     *
!     * @throws	SQLException
!     * 			Thrown if an error closing the SQL connection. The session
!     * 			will still be closed even though the connection may not have
!     *			been.
!     */
!    void close() throws SQLException;
  
!    /**
!     * Close the current connection to the database.
!     *
!     * @throws	SQLException	if an SQL error occurs.
!     */
!    void closeSQLConnection() throws SQLException;
  
     void setSessionInternalFrame(SessionInternalFrame sif);
  
!    /**
!     * Reconnect to the database.
!     */
!    void reconnect();
  
!    Object getPluginObject(IPlugin plugin, String key);
!    Object putPluginObject(IPlugin plugin, String key, Object obj);
!    void removePluginObject(IPlugin plugin, String key);
  
!    void setMessageHandler(IMessageHandler handler);
!    IMessageHandler getMessageHandler();
  
!    SessionPanel getSessionSheet();
  
     SessionInternalFrame getSessionInternalFrame();
***************
*** 141,211 ****
  //	SQLFilterClauses getSQLFilterClauses();
  
! 	/**
! 	 * Retrieve the schema information object for this session.
! 	 */
! 	SchemaInfo getSchemaInfo();
  
     /**
! 	 * Select a tab in the main tabbed pane.
! 	 *
! 	 * @param	tabIndex	The tab to select. @see #IMainTabIndexes
! 	 *
! 	 * @throws	IllegalArgumentException
! 	 *			Thrown if an invalid <TT>tabIndex</TT> passed.
! 	 */
! 	void selectMainTab(int tabIndex) throws IllegalArgumentException;
  
! 	/**
! 	 * Add a tab to the main tabbed panel.
! 	 *
! 	 * @param	tab	 The tab to be added.
! 	 *
! 	 * @throws	IllegalArgumentException
! 	 *			Thrown if a <TT>null</TT> <TT>IMainPanelTab</TT> passed.
! 	 */
! 	void addMainTab(IMainPanelTab tab);
  
! 	/**
! 	 * Add component to the session sheets status bar.
! 	 *
! 	 * @param	comp	Component to add.
! 	 */
! 	void addToStatusBar(JComponent comp);
  
! 	/**
! 	 * Remove component to the session sheets status bar.
! 	 *
! 	 * @param	comp	Component to remove.
! 	 */
! 	void removeFromStatusBar(JComponent comp);
  
! 	/**
! 	 * Add a listener to this session
! 	 *
! 	 * @param	lis		The listener to add.
! 	 *
! 	 * @throws	IllegalArgumentException
! 	 * 			Thrown if a <TT>null</TT> listener passed.
! 	 */
  // JASON: Removed as part of patch
  //	void addSessionListener(ISessionListener lis);
  
! 	/**
! 	 * Remove a listener from this session
! 	 *
! 	 * @param	lis		The listener to remove.
! 	 *
! 	 * @throws	IllegalArgumentException
! 	 * 			Thrown if a <TT>null</TT> listener passed.
! 	 */
  //	 JASON: Removed as part of patch
  //	void removeSessionListener(ISessionListener lis);
  
! 	/**
! 	 * Retrieve the descriptive title of this session.
! 	 *
! 	 * @return		The descriptive title of this session.
! 	 */
! 	String getTitle();
  
      /**
--- 142,212 ----
  //	SQLFilterClauses getSQLFilterClauses();
  
!    /**
!     * Retrieve the schema information object for this session.
!     */
!    net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo getSchemaInfo();
  
     /**
!     * Select a tab in the main tabbed pane.
!     *
!     * @param	tabIndex	The tab to select. @see #IMainTabIndexes
!     *
!     * @throws	IllegalArgumentException
!     *			Thrown if an invalid <TT>tabIndex</TT> passed.
!     */
!    void selectMainTab(int tabIndex) throws IllegalArgumentException;
  
!    /**
!     * Add a tab to the main tabbed panel.
!     *
!     * @param	tab	 The tab to be added.
!     *
!     * @throws	IllegalArgumentException
!     *			Thrown if a <TT>null</TT> <TT>IMainPanelTab</TT> passed.
!     */
!    void addMainTab(IMainPanelTab tab);
  
!    /**
!     * Add component to the session sheets status bar.
!     *
!     * @param	comp	Component to add.
!     */
!    void addToStatusBar(JComponent comp);
  
!    /**
!     * Remove component to the session sheets status bar.
!     *
!     * @param	comp	Component to remove.
!     */
!    void removeFromStatusBar(JComponent comp);
  
!    /**
!     * Add a listener to this session
!     *
!     * @param	lis		The listener to add.
!     *
!     * @throws	IllegalArgumentException
!     * 			Thrown if a <TT>null</TT> listener passed.
!     */
  // JASON: Removed as part of patch
  //	void addSessionListener(ISessionListener lis);
  
!    /**
!     * Remove a listener from this session
!     *
!     * @param	lis		The listener to remove.
!     *
!     * @throws	IllegalArgumentException
!     * 			Thrown if a <TT>null</TT> listener passed.
!     */
  //	 JASON: Removed as part of patch
  //	void removeSessionListener(ISessionListener lis);
  
!    /**
!     * Retrieve the descriptive title of this session.
!     *
!     * @return		The descriptive title of this session.
!     */
!    String getTitle();
  
      /**
***************
*** 214,230 ****
       * @return the value of DatabaseMetaData.getDatabaseProductName
       */
! 	String getDatabaseProductName();
!     
     /**
! 	 * Add the passed action to the toolbar of the sessions main window.
! 	 *
! 	 * @param	action	Action to be added.
! 	 */
! 	void addToToolbar(Action action);
  
     public void addSeparatorToToolbar();
  
! 	/**
! 	 * The code in any SQLEditor is parsed in the background. You may attach a listener to the ParserEventsProcessor
      * to get to know about the results of parsing. The events are passed synchron with the event queue
      * (via SwingUtils.invokeLater()). At the moment events are produced for errors in the SQLScript
--- 215,231 ----
       * @return the value of DatabaseMetaData.getDatabaseProductName
       */
!    String getDatabaseProductName();
! 
     /**
!     * Add the passed action to the toolbar of the sessions main window.
!     *
!     * @param	action	Action to be added.
!     */
!    void addToToolbar(Action action);
  
     public void addSeparatorToToolbar();
  
!    /**
!     * The code in any SQLEditor is parsed in the background. You may attach a listener to the ParserEventsProcessor
      * to get to know about the results of parsing. The events are passed synchron with the event queue
      * (via SwingUtils.invokeLater()). At the moment events are produced for errors in the SQLScript
***************
*** 233,238 ****
      * <p>
      * If you want the ParserEventsProcessor to produce further events feel free to contact ger...@us....
! 	 */
! 	IParserEventsProcessor getParserEventsProcessor(IIdentifier sqlEntryPanelIdentifier);
  
     void setActiveSessionWindow(BaseSessionInternalFrame activeActiveSessionWindow);
--- 234,239 ----
      * <p>
      * If you want the ParserEventsProcessor to produce further events feel free to contact ger...@us....
!     */
!    IParserEventsProcessor getParserEventsProcessor(IIdentifier sqlEntryPanelIdentifier);
  
     void setActiveSessionWindow(BaseSessionInternalFrame activeActiveSessionWindow);
***************
*** 278,282 ****
      */
     public void setPluginsfinishedLoading(boolean _finishedLoading);
!    
     /**
      * Determine from the session whether or not it is ok to close it.  It might
--- 279,283 ----
      */
     public void setPluginsfinishedLoading(boolean _finishedLoading);
! 
     /**
      * Determine from the session whether or not it is ok to close it.  It might

--- SchemaInfo.java DELETED ---

Index: SQLExecuterTask.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** SQLExecuterTask.java	22 Apr 2006 15:27:05 -0000	1.28
--- SQLExecuterTask.java	3 May 2006 10:49:38 -0000	1.29
***************
*** 39,42 ****
--- 39,43 ----
  import net.sourceforge.squirrel_sql.client.session.event.ISQLExecutionListener;
  import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
+ import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfoUpdateCheck;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
***************
*** 46,50 ****
  import net.sourceforge.squirrel_sql.fw.sql.QueryTokenizer;
  import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
- import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
  import net.sourceforge.squirrel_sql.fw.sql.TableInfo;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
--- 47,50 ----

--- SchemaInfoUpdateListener.java DELETED ---

--- SchemaInfoUpdateCheck.java DELETED ---

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/I18NStrings.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** I18NStrings.properties	15 Apr 2006 15:49:02 -0000	1.18
--- I18NStrings.properties	3 May 2006 10:49:38 -0000	1.19
***************
*** 66,80 ****
  Session.reconnError=Reconnect error {0}
  
- SchemaInfo.UnableToLoadColumns=Unable to load columns for table {0} because database meta data is unavailable. Propably reconnecting failed.
- SchemaInfo.SuccessfullyRestoredDatabaseMetaData=Successfully restored database meta data
- SchemaInfo.loadingCatalogs=Loading catalogs
- SchemaInfo.loadingDataTypes=Loading data types
- SchemaInfo.loadingFunctions=Loading functions
- SchemaInfo.loadingKeywords=Loading keywords
- SchemaInfo.loadingSchemas=Loading schemas
- SchemaInfo.loadingStoredProcedures=Loading stored procedures
- SchemaInfo.loadingTables=Loading tables
- 
- 
  
  SessionManager.ErrorClosingSession=Error closing Session:{0}
--- 66,69 ----