[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client Application.java,1.18,1.19

[g. g. <gw...@us...>]

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

Modified Files:
	Application.java 
Log Message:
hooks for EditWhereCols function


Index: Application.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/Application.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Application.java	16 Jan 2004 04:58:56 -0000	1.18
--- Application.java	20 Apr 2004 19:46:43 -0000	1.19
***************
*** 54,58 ****
  import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
  import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
- import net.sourceforge.squirrel_sql.fw.datasetviewer.CellImportExportInfo;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellImportExportInfoSaver;
  
--- 54,57 ----
***************
*** 77,80 ****
--- 76,82 ----
  import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLHistory;
  import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
+ import net.sourceforge.squirrel_sql.client.session.properties.EditWhereCols;
+ 
+ 
  /**
   * Defines the API to do callbacks on the application.
***************
*** 269,272 ****
--- 271,278 ----
  		// Save options selected for Cell Import Export operations
  		saveCellImportExportInfo();
+ 		
+ 		// Save options selected for Edit Where Columns
+ 		saveEditWhereColsInfo();
+ 
  
  		String msg = s_stringMgr.getString("Application.shutdowncomplete",
***************
*** 578,581 ****
--- 584,592 ----
  		indicateNewStartupTask(splash, "Loading Cell Import/Export selections...");
  		loadCellImportExportInfo();
+ 		
+ //????		
+ //????		indicateNewStartupTask(splash, "Loading Edit 'Where' Columns selections...");
+ //?????		loadEditWhereColsInfo();
+ //???????
  
  		indicateNewStartupTask(splash, "Showing main window...");
***************
*** 725,728 ****
--- 736,788 ----
  		}
  	}
+ 	
+ 	/**
+ 	 * Load the options previously selected by user for import/export of
+ 	 * data in various Cells.
+ 	 */
+ 	private void loadEditWhereColsInfo()
+ 	{
+ 		EditWhereCols saverInstance = null;
+ 		try
+ 		{
+ 			XMLBeanReader doc = new XMLBeanReader();
+ 			doc.load(new ApplicationFiles().getEditWhereColsFile());
+ 			Iterator it = doc.iterator();
+ 			if (it.hasNext())
+ 			{
+ 				saverInstance = (EditWhereCols)it.next();
+ 			}
+ 		}
+ 		catch (FileNotFoundException ignore)
+ 		{
+ 			// Cell Import/Export file not found for user - first time user ran pgm.
+ 		}
+ 		catch (Exception ex)
+ 		{
+ 			s_log.error("Unable to load Cell Import/Export selections from persistant storage.", ex);
+ 		}
+ 		finally
+ 		{
+ 			// set the singleton instance of the Saver class to be the
+ 			// instance just created by the XMLBeanReader
+ //????			CellImportExportInfoSaver.setInstance(saverInstance);
+ 		}
+ 	}
+ 	
+ 	/**
+ 	 * Save the options selected by user for Cell Import Export.
+ 	 */
+ 	private void saveEditWhereColsInfo()
+ 	{
+ 		try
+ 		{
+ 			XMLBeanWriter wtr = new XMLBeanWriter(EditWhereCols.getInstance());
+ 			wtr.save(new ApplicationFiles().getEditWhereColsFile());
+ 		}
+ 		catch (Exception ex)
+ 		{
+ 			s_log.error("Unable to write Edit Where Cols options to persistant storage.", ex);
+ 		}
+ 	}
  
  	/**