[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client ApplicationListener.java, NONE, 1.1 IApplication.java, 1.17, 1.18 Application.java, 1.56, 1.57

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

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

Modified Files:
	IApplication.java Application.java 
Added Files:
	ApplicationListener.java 
Log Message:
Initial version of Aliases in tree, to be continued.

Index: Application.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/Application.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** Application.java	5 May 2008 00:12:22 -0000	1.56
--- Application.java	5 Jun 2008 01:25:27 -0000	1.57
***************
*** 37,43 ****
  import java.io.PrintWriter;
  import java.sql.DriverManager;
! import java.util.Calendar;
! import java.util.Iterator;
! import java.util.Locale;
  
  import javax.swing.Action;
--- 37,41 ----
  import java.io.PrintWriter;
  import java.sql.DriverManager;
! import java.util.*;
  
  import javax.swing.Action;
***************
*** 152,161 ****
  	private int _jdbcDebugType = SquirrelPreferences.IJdbcDebugTypes.NONE;
  
!     /** contains info about files and directories used by the application. */
!     private ApplicationFiles _appFiles = null;
!     
!     private EditWhereCols editWhereCols = new EditWhereCols();
!     
! 	/**
  	 * Default ctor.
  	 */
--- 150,163 ----
  	private int _jdbcDebugType = SquirrelPreferences.IJdbcDebugTypes.NONE;
  
!    /**
!     * contains info about files and directories used by the application.
!     */
!    private ApplicationFiles _appFiles = null;
! 
!    private EditWhereCols editWhereCols = new EditWhereCols();
! 
!    private List<ApplicationListener> _listeners = new ArrayList<ApplicationListener>();
! 
!    /**
  	 * Default ctor.
  	 */
***************
*** 285,291 ****
       */
      public void saveApplicationState() {
-         saveGlobalPreferences();
  
! 		saveDrivers();
  
  		saveAliases();
--- 287,300 ----
       */
      public void saveApplicationState() {
  
!       _prefs.setFirstRun(false);
! 
! 
!       for (ApplicationListener l : _listeners.toArray(new ApplicationListener[0]))
!       {
!          l.saveApplicationState();
!       }
! 
!       saveDrivers();
  
  		saveAliases();
***************
*** 302,326 ****
  		// Save options selected for DataType-specific properties
  		saveDataTypePreferences();
-     }
- 
-     /**
-      * Remember the currently selected entries in the aliases and drivers 
-      * windows.
-      */
-     private void saveGlobalPreferences() {
-         // JASON: Do in WindowManager and do much better
-         // final MainFrame mf = _windowManager.getMainFrame();
-         
-         int idx = _windowManager.getAliasesListInternalFrame().getSelectedIndex();
- 		_prefs.setAliasesSelectedIndex(idx);
- 		idx = _windowManager.getDriversListInternalFrame().getSelectedIndex();
- 		_prefs.setDriversSelectedIndex(idx);
- 
- 		// No longer the first run of SQuirrel.
- 		_prefs.setFirstRun(false);
  
! 		_prefs.save();
      }
  
      /**
       * Builds a Locale from the user's preferred locale preference.
--- 311,319 ----
  		// Save options selected for DataType-specific properties
  		saveDataTypePreferences();
  
!        _prefs.save();
      }
  
+ 
      /**
       * Builds a Locale from the user's preferred locale preference.
***************
*** 1096,1102 ****
                  saveDrivers();
                  break;
-             case GLOBAL_PREFERENCES:
-                 saveGlobalPreferences();
-                 break;
              case DATATYPE_PREFERENCES:
                  saveDataTypePreferences();
--- 1089,1092 ----
***************
*** 1116,1120 ****
      }
  
! 	/**
  	 * Setup applications Look and Feel.
  	 */
--- 1106,1120 ----
      }
  
!    public void addApplicationListener(ApplicationListener l)
!    {
!       _listeners.add(l);
!    }
! 
!    public void removeApplicationListener(ApplicationListener l)
!    {
!       _listeners.remove(l);
!    }
! 
!    /**
  	 * Setup applications Look and Feel.
  	 */

Index: IApplication.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/IApplication.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** IApplication.java	5 May 2008 00:12:22 -0000	1.17
--- IApplication.java	5 Jun 2008 01:25:27 -0000	1.18
***************
*** 228,230 ****
--- 228,235 ----
      public void savePreferences(PreferenceType preferenceType);
      
+ 
+    void addApplicationListener(ApplicationListener l);
+ 
+    void removeApplicationListener(ApplicationListener l);
+ 
  }

--- NEW FILE: ApplicationListener.java ---
package net.sourceforge.squirrel_sql.client;

public interface ApplicationListener
{
   void saveApplicationState();
}