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

[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-serv25339

Modified Files:
	Application.java 
Log Message:
add DTProperties


Index: Application.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/Application.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Application.java	23 Apr 2004 18:29:44 -0000	1.20
--- Application.java	12 May 2004 17:34:32 -0000	1.21
***************
*** 55,59 ****
  import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellImportExportInfoSaver;
! 
  import net.sourceforge.squirrel_sql.client.action.ActionCollection;
  import net.sourceforge.squirrel_sql.client.db.AliasMaintSheetFactory;
--- 55,59 ----
  import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellImportExportInfoSaver;
! import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DTProperties;
  import net.sourceforge.squirrel_sql.client.action.ActionCollection;
  import net.sourceforge.squirrel_sql.client.db.AliasMaintSheetFactory;
***************
*** 274,278 ****
  		// Save options selected for Edit Where Columns
  		saveEditWhereColsInfo();
! 
  
  		String msg = s_stringMgr.getString("Application.shutdowncomplete",
--- 274,280 ----
  		// Save options selected for Edit Where Columns
  		saveEditWhereColsInfo();
! 		
! 		// Save options selected for DataType-specific properties
! 		saveDTProperties();
  
  		String msg = s_stringMgr.getString("Application.shutdowncomplete",
***************
*** 587,591 ****
  		indicateNewStartupTask(splash, "Loading Edit 'Where' Columns selections...");
  		loadEditWhereColsInfo();
! 
  		indicateNewStartupTask(splash, "Showing main window...");
  		_mainFrame.setVisible(true);
--- 589,596 ----
  		indicateNewStartupTask(splash, "Loading Edit 'Where' Columns selections...");
  		loadEditWhereColsInfo();
! 				
! 		indicateNewStartupTask(splash, "Loading Data Type Properties...");
! 		loadDTProperties();
! 		
  		indicateNewStartupTask(splash, "Showing main window...");
  		_mainFrame.setVisible(true);
***************
*** 736,741 ****
  	
  	/**
! 	 * Load the options previously selected by user for import/export of
! 	 * data in various Cells.
  	 */
  	private void loadEditWhereColsInfo()
--- 741,746 ----
  	
  	/**
! 	 * Load the options previously selected by user for specific cols to use
! 	 * in WHERE clause when editing cells.
  	 */
  	private void loadEditWhereColsInfo()
***************
*** 750,754 ****
  			{
  				saverInstance = (EditWhereCols)it.next();
! EditWhereCols x = saverInstance;
  			}
  		}
--- 755,759 ----
  			{
  				saverInstance = (EditWhereCols)it.next();
! 				EditWhereCols x = saverInstance;
  			}
  		}
***************
*** 763,769 ****
  		finally
  		{
! 			// set the singleton instance of the Saver class to be the
! 			// instance just created by the XMLBeanReader
! //????			CellImportExportInfoSaver.setInstance(saverInstance);
  		}
  	}
--- 768,772 ----
  		finally
  		{
! 			// nothing needed here??
  		}
  	}
***************
*** 784,787 ****
--- 787,840 ----
  		}
  	}
+ 	
+ 	
+ 	/**
+ 	 * Load the options previously selected by user for specific cols to use
+ 	 * in WHERE clause when editing cells.
+ 	 */
+ 	private void loadDTProperties()
+ 	{
+ 		DTProperties saverInstance = null;
+ 		try
+ 		{
+ 			XMLBeanReader doc = new XMLBeanReader();
+ 			doc.load(new ApplicationFiles().getDTPropertiesFile());
+ 			Iterator it = doc.iterator();
+ 			if (it.hasNext())
+ 			{
+ 				saverInstance = (DTProperties)it.next();
+ 				DTProperties x = saverInstance;
+ 			}
+ 		}
+ 		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 DataType Properties selections from persistant storage.", ex);
+ 		}
+ 		finally
+ 		{
+ 			// nothing needed here??
+ 		}
+ 	}
+ 	
+ 	/**
+ 	 * Save the options selected by user for Cell Import Export.
+ 	 */
+ 	private void saveDTProperties()
+ 	{
+ 		try
+ 		{
+ 			XMLBeanWriter wtr = new XMLBeanWriter(new DTProperties());
+ 			wtr.save(new ApplicationFiles().getDTPropertiesFile());
+ 		}
+ 		catch (Exception ex)
+ 		{
+ 			s_log.error("Unable to write DataType properties to persistant storage.", ex);
+ 		}
+ 	}
+ 
  
  	/**