squirrel-sql-commits — A list that broadcasts CVS commit activity

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeBlob.java,1.3,1.4

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv944

Modified Files:
	DataTypeBlob.java 
Log Message:
remove LOB object


Index: DataTypeBlob.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBlob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DataTypeBlob.java	17 May 2004 15:28:34 -0000	1.3
--- DataTypeBlob.java	17 May 2004 16:34:17 -0000	1.4
***************
*** 49,53 ****
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  
  /**
--- 49,52 ----
***************
*** 494,499 ****
  	  * type of object to be stored in the table cell.
  	  */
! 	public Object readResultSet(ResultSet rs, int index,
! 		LargeResultSetObjectInfo largeObjInfo)
  		throws java.sql.SQLException {
  		
--- 493,497 ----
  	  * type of object to be stored in the table cell.
  	  */
! 	public Object readResultSet(ResultSet rs, int index)
  		throws java.sql.SQLException {
  		

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeBinary.java,1.9,1.10

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv840

Modified Files:
	DataTypeBinary.java 
Log Message:
remove LOB object


Index: DataTypeBinary.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBinary.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DataTypeBinary.java	17 Apr 2004 03:32:06 -0000	1.9
--- DataTypeBinary.java	17 May 2004 16:34:01 -0000	1.10
***************
*** 34,40 ****
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
- //??import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  
  /**
--- 34,38 ----
***************
*** 355,360 ****
  	  * type of object to be stored in the table cell.
  	  */
! 	public Object readResultSet(ResultSet rs, int index,
! 		LargeResultSetObjectInfo largeObjInfo)
  		throws java.sql.SQLException {
  		
--- 353,357 ----
  	  * type of object to be stored in the table cell.
  	  */
! 	public Object readResultSet(ResultSet rs, int index)
  		throws java.sql.SQLException {
  		

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeBigDecimal.java,1.8,1.9

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv803

Modified Files:
	DataTypeBigDecimal.java 
Log Message:
remove LOB objct


Index: DataTypeBigDecimal.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBigDecimal.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DataTypeBigDecimal.java	26 Apr 2004 17:50:56 -0000	1.8
--- DataTypeBigDecimal.java	17 May 2004 16:33:37 -0000	1.9
***************
*** 36,42 ****
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
- //??import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  
  /**
--- 36,40 ----
***************
*** 385,390 ****
  	  * type of object to be stored in the table cell.
  	  */
! 	public Object readResultSet(ResultSet rs, int index,
! 		LargeResultSetObjectInfo largeObjInfo)
  		throws java.sql.SQLException {
  		
--- 383,387 ----
  	  * type of object to be stored in the table cell.
  	  */
! 	public Object readResultSet(ResultSet rs, int index)
  		throws java.sql.SQLException {
  		

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent CellComponentFactory.java,1.25,1.26

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv540

Modified Files:
	CellComponentFactory.java 
Log Message:
remove lob object


Index: CellComponentFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CellComponentFactory.java	17 May 2004 15:30:36 -0000	1.25
--- CellComponentFactory.java	17 May 2004 16:32:31 -0000	1.26
***************
*** 488,492 ****
  		if (dataTypeObject != null) {
  			// we have an appropriate data type object
! 			return dataTypeObject.readResultSet(rs, index, largeObjInfo);
  		}
  
--- 488,492 ----
  		if (dataTypeObject != null) {
  			// we have an appropriate data type object
! 			return dataTypeObject.readResultSet(rs, index);
  		}
  

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties FormatSessionPropertiesPanel.java,1.5,1.6

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

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

Modified Files:
	FormatSessionPropertiesPanel.java 
Log Message:
let data types handle their own options


Index: FormatSessionPropertiesPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/FormatSessionPropertiesPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FormatSessionPropertiesPanel.java	3 Feb 2004 02:06:41 -0000	1.5
--- FormatSessionPropertiesPanel.java	17 May 2004 15:32:09 -0000	1.6
***************
*** 37,40 ****
--- 37,42 ----
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
+ import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
  
  import net.sourceforge.squirrel_sql.client.IApplication;
***************
*** 58,61 ****
--- 60,64 ----
  	private SessionProperties _props;
  
+ 
  	/**
  	 * ctor specifying the Application API.
***************
*** 127,138 ****
  			String BLOB = "Blob";
  			String CLOB = "Clob";
! 			String HINT = "Specify formatting options";
  			String NBR_BYTES = "Number of bytes to read:";
  			String NBR_CHARS = "Number of chars to read:";
  			String SQL_OTHER = "Display SQL Other (Data Type 1111) as String";
! 			String TITLE = "Format";
  			String BLOB_WARNING = "Some DBMSs implement BLOB/CLOB fields as other Data Types\nsuch as BINARY and VARCHAR.\nThe following works only for Data Types 2004(BLOB) and 2005(CLOB).";
  			String OTHER_TYPE_WARNING = "The following Data Types are not the same in all DBMSs and\nmay cause exceptions if interpreted as Strings.";
  		}
  
  		private JCheckBox _showBlobChk = new JCheckBox(i18n.BLOB);
--- 130,144 ----
  			String BLOB = "Blob";
  			String CLOB = "Clob";
! 			String HINT = "Set options for specific Data Types";
  			String NBR_BYTES = "Number of bytes to read:";
  			String NBR_CHARS = "Number of chars to read:";
  			String SQL_OTHER = "Display SQL Other (Data Type 1111) as String";
! 			String TITLE = "Data Type Controls";
  			String BLOB_WARNING = "Some DBMSs implement BLOB/CLOB fields as other Data Types\nsuch as BINARY and VARCHAR.\nThe following works only for Data Types 2004(BLOB) and 2005(CLOB).";
  			String OTHER_TYPE_WARNING = "The following Data Types are not the same in all DBMSs and\nmay cause exceptions if interpreted as Strings.";
  		}
+ 		
+ 		/** List of OkJPanels containing controls for specific DataType info */
+ 		OkJPanel[] dataTypePanels;
  
  		private JCheckBox _showBlobChk = new JCheckBox(i18n.BLOB);
***************
*** 199,202 ****
--- 205,211 ----
  			largeObjInfo.setReadSQLOther(_showSQLOtherChk.isSelected());
  			largeObjInfo.setReadAllOther(_showAllOtherChk.isSelected());
+ 			
+ 			for (int i=0; i< dataTypePanels.length; i++)
+ 				dataTypePanels[i].ok();
  		}
  
***************
*** 231,234 ****
--- 240,244 ----
  		private JPanel createDataTypesPanel()
  		{
+ /*****
  			_showBlobSizeField.setColumns(5);
  			_showClobSizeField.setColumns(5);
***************
*** 238,244 ****
  			_blobTypeDrop.addActionListener(_controlMediator);
  			_clobTypeDrop.addActionListener(_controlMediator);
  
  			JPanel pnl = new JPanel(new GridBagLayout());
! 			pnl.setBorder(BorderFactory.createTitledBorder("Show Data as Strings for Columns of these Data Types"));
  			final GridBagConstraints gbc = new GridBagConstraints();
  			gbc.fill = GridBagConstraints.HORIZONTAL;
--- 248,255 ----
  			_blobTypeDrop.addActionListener(_controlMediator);
  			_clobTypeDrop.addActionListener(_controlMediator);
+ ******/
  
  			JPanel pnl = new JPanel(new GridBagLayout());
! //??			pnl.setBorder(BorderFactory.createTitledBorder("Show Data as Strings for Columns of these Data Types"));
  			final GridBagConstraints gbc = new GridBagConstraints();
  			gbc.fill = GridBagConstraints.HORIZONTAL;
***************
*** 249,252 ****
--- 260,264 ----
  			gbc.gridy = 0;
  
+ /*****
  			pnl.add(new JLabel(""), gbc);
  			
***************
*** 309,313 ****
--- 321,334 ----
  			++gbc.gridy;
  			pnl.add(_showAllOtherChk, gbc);
+ /************************************************************************************/
  
+ 			dataTypePanels = CellComponentFactory.getControlPanels();
+ 			for (int i=0; i<dataTypePanels.length; i++) {
+ 				gbc.gridx=0;
+ 				gbc.gridwidth = GridBagConstraints.REMAINDER;
+ 				++gbc.gridy;
+ 				pnl.add(dataTypePanels[i], gbc);
+ 			}
+ 			
  			return pnl;
  		}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent CellComponentFactory.java,1.24,1.25

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18289

Modified Files:
	CellComponentFactory.java 
Log Message:
handle option setting in DataType control panels


Index: CellComponentFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CellComponentFactory.java	13 May 2004 17:01:26 -0000	1.24
--- CellComponentFactory.java	17 May 2004 15:30:36 -0000	1.25
***************
*** 8,12 ****
  import javax.swing.JTextArea;
  import javax.swing.JLabel;
- import javax.swing.JPanel;
  
  import java.awt.Component;
--- 8,11 ----
***************
*** 34,37 ****
--- 33,37 ----
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
  
  
***************
*** 673,677 ****
  	  * 	- those that are specifically listed in the variable initialClassNameList
  	  */
! 	 public static JPanel[] getControlPanels() {
  		ArrayList panelList = new ArrayList();
  		
--- 673,677 ----
  	  * 	- those that are specifically listed in the variable initialClassNameList
  	  */
! 	 public static OkJPanel[] getControlPanels() {
  		ArrayList panelList = new ArrayList();
  		
***************
*** 709,713 ****
  					Class.forName(className).getMethod("getControlPanel", parameterTypes);
  					
! 				JPanel panel = (JPanel)panelMethod.invoke(null, null);
  				panelList.add(panel);
  			}
--- 709,713 ----
  					Class.forName(className).getMethod("getControlPanel", parameterTypes);
  					
! 				OkJPanel panel = (OkJPanel)panelMethod.invoke(null, null);
  				panelList.add(panel);
  			}
***************
*** 717,721 ****
  		}
  		
! 		return (JPanel[])panelList.toArray(new JPanel[0]);
  	}
  
--- 717,721 ----
  		}
  		
! 		return (OkJPanel[])panelList.toArray(new OkJPanel[0]);
  	}
  

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeUnknown.java,1.5,1.6

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18051

Modified Files:
	DataTypeUnknown.java 
Log Message:
handle options locally


Index: DataTypeUnknown.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeUnknown.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeUnknown.java	7 Apr 2004 02:47:47 -0000	1.5
--- DataTypeUnknown.java	17 May 2004 15:29:32 -0000	1.6
***************
*** 27,32 ****
--- 27,34 ----
  import javax.swing.JTextField;
  import javax.swing.JTextArea;
+ import javax.swing.JCheckBox;
  import javax.swing.SwingUtilities;
  import javax.swing.text.JTextComponent;
+ import javax.swing.BorderFactory;
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
***************
*** 35,41 ****
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
- //??import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  
  /**
--- 37,43 ----
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
  
  /**
***************
*** 96,99 ****
--- 98,122 ----
  
  
+ 
+ 	/**
+ 	 * Name of this class, which is needed because the class name is needed
+ 	 * by the static method getControlPanel, so we cannot use something
+ 	 * like getClass() to find this name.
+ 	 */
+ 	private static final String thisClassName =
+ 		"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeUnknown";
+ 
+ 	/*
+ 	 * Properties settable by the user
+ 	 */
+ 	 // flag for whether we have already loaded the properties or not
+ 	 private static boolean propertiesAlreadyLoaded = false;
+ 	 
+ 		 
+ 	/** Read the contents of Other from Result sets when first loading the tables. */
+ 	private static boolean _readUnknown = false;
+ 	
+ 	
+ 
  	/**
  	 * Constructor - save the data needed by this data type.
***************
*** 103,106 ****
--- 126,157 ----
  		_colDef = colDef;
  		_isNullable = colDef.isNullable();
+ 
+ 		loadProperties();
+ 	}
+ 	
+ 	/** Internal function to get the user-settable properties from the DTProperties,
+ 	 * if they exist, and to ensure that defaults are set if the properties have
+ 	 * not yet been created.
+ 	 * <P>
+ 	 * This method may be called from different places depending on whether
+ 	 * an instance of this class is created before the user brings up the Session
+ 	 * Properties window.  In either case, the data is static and is set only
+ 	 * the first time we are called.
+ 	 */
+ 	private static void loadProperties() {
+ 		
+ 		//set the property values
+ 		// Note: this may have already been done by another instance of
+ 		// this DataType created to handle a different column.
+ 		if (propertiesAlreadyLoaded == false) {
+ 			// get parameters previously set by user, or set default values
+ 			_readUnknown = false;	// set to the default
+ 			String readUnknownString = DTProperties.get(
+ 				thisClassName, "readUnknown");
+ 			if (readUnknownString != null && readUnknownString.equals("true"))
+ 				_readUnknown = true;
+ 
+ 			propertiesAlreadyLoaded = true;
+ 		}
  	}
  	
***************
*** 274,278 ****
  
  		String data = null;
! 		if (largeObjInfo.getReadAllOther())
  		{
  			// Running getObject on a java class attempts
--- 325,329 ----
  
  		String data = null;
! 		if (_readUnknown)
  		{
  			// Running getObject on a java class attempts
***************
*** 415,417 ****
--- 466,559 ----
  		throw new IOException("Can not export data type OTHER");
  	 }
+ 
+ 
+ 
+ 	/*
+ 	 * Property change control panel
+ 	 */	  
+ 	 
+ 	 /**
+ 	  * Generate a JPanel containing controls that allow the user
+ 	  * to adjust the properties for this DataType.
+ 	  * All properties are static accross all instances of this DataType. 
+ 	  * However, the class may choose to apply the information differentially,
+ 	  * such as keeping a list (also entered by the user) of table/column names
+ 	  * for which certain properties should be used.
+ 	  * <P>
+ 	  * This is called ONLY if there is at least one property entered into the DTProperties
+ 	  * for this class.
+ 	  * <P>
+ 	  * Since this method is called by reflection on the Method object derived from this class,
+ 	  * it does not need to be included in the Interface.
+ 	  * It would be nice to include this in the Interface for consistancy, documentation, etc,
+ 	  * but the Interface does not seem to like static methods.
+ 	  */
+ 	 public static OkJPanel getControlPanel() {
+ 	 	
+ 		/*
+ 		 * If you add this method to one of the standard DataTypes in the
+ 		 * fw/datasetviewer/cellcomponent directory, you must also add the name
+ 		 * of that DataType class to the list in CellComponentFactory, method
+ 		 * getControlPanels, variable named initialClassNameList.
+ 		 * If the class is being registered with the factory using registerDataType,
+ 		 * then you should not include the class name in the list (it will be found
+ 		 * automatically), but if the DataType is part of the case statement in the
+ 		 * factory method getDataTypeObject, then it does need to be explicitly listed
+ 		 * in the getControlPanels method also.
+ 		 */
+ 		 
+ 		 // if this panel is called before any instances of the class have been
+ 		 // created, we need to load the properties from the DTProperties.
+ 		 loadProperties();
+ 		 
+ 		return new UnknownOkJPanel();
+ 	 }
+ 	 
+ 	 
+ 	 
+ 	 /**
+ 	  * Inner class that extends OkJPanel so that we can call the ok()
+ 	  * method to save the data when the user is happy with it.
+ 	  */
+ 	 private static class UnknownOkJPanel extends OkJPanel {
+ 		/*
+ 		 * GUI components - need to be here because they need to be
+ 		 * accessible from the event handlers to alter each other's state.
+ 		 */
+ 		// check box for whether to read contents during table load or not
+ 		private JCheckBox _showUnknownChk = new JCheckBox(
+ 			"Read contents when table is first loaded and display as string");
+ 
+ 
+ 		public UnknownOkJPanel() {
+ 		 	 
+ 			/* set up the controls */
+ 			// checkbox for read/not-read on table load
+ 			_showUnknownChk.setSelected(_readUnknown);
+ 
+ 			/*
+ 			 * Create the panel and add the GUI items to it
+ 			 */
+  		
+ 			setBorder(BorderFactory.createTitledBorder(
+ 				"Unknown DataTypes   (non-standard SQL type codes)"));
+ 
+ 			add(_showUnknownChk);
+ 
+ 		} // end of constructor for inner class
+ 	 
+ 	 
+ 		/**
+ 		 * User has clicked OK in the surrounding JPanel,
+ 		 * so save the current state of all variables
+ 		 */
+ 		public void ok() {
+ 			// get the values from the controls and set them in the static properties
+ 			_readUnknown = _showUnknownChk.isSelected();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"readUnknown", Boolean.toString(_readUnknown));
+ 		}
+ 	 
+ 	 } // end of inner class
  }

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeOther.java,1.5,1.6

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17988

Modified Files:
	DataTypeOther.java 
Log Message:
handle options locally


Index: DataTypeOther.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeOther.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeOther.java	7 Apr 2004 02:45:04 -0000	1.5
--- DataTypeOther.java	17 May 2004 15:29:16 -0000	1.6
***************
*** 28,32 ****
--- 28,34 ----
  import javax.swing.JTable;
  import javax.swing.SwingUtilities;
+ import javax.swing.BorderFactory;
  import javax.swing.text.JTextComponent;
+ import javax.swing.JCheckBox;
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
***************
*** 38,41 ****
--- 40,44 ----
  import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
  
  /**
***************
*** 94,97 ****
--- 97,120 ----
  	private DefaultColumnRenderer _renderer = DefaultColumnRenderer.getInstance();	
  
+ 
+ 	/**
+ 	 * Name of this class, which is needed because the class name is needed
+ 	 * by the static method getControlPanel, so we cannot use something
+ 	 * like getClass() to find this name.
+ 	 */
+ 	private static final String thisClassName =
+ 		"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeOther";
+ 
+ 	/*
+ 	 * Properties settable by the user
+ 	 */
+ 	 // flag for whether we have already loaded the properties or not
+ 	 private static boolean propertiesAlreadyLoaded = false;
+ 	 
+ 		 
+ 	/** Read the contents of Other from Result sets when first loading the tables. */
+ 	private static boolean _readSQLOther = false;
+ 	
+ 
  	/**
  	 * Constructor - save the data needed by this data type.
***************
*** 101,104 ****
--- 124,155 ----
  		_colDef = colDef;
  		_isNullable = colDef.isNullable();
+ 
+ 		loadProperties();
+ 	}
+ 	
+ 	/** Internal function to get the user-settable properties from the DTProperties,
+ 	 * if they exist, and to ensure that defaults are set if the properties have
+ 	 * not yet been created.
+ 	 * <P>
+ 	 * This method may be called from different places depending on whether
+ 	 * an instance of this class is created before the user brings up the Session
+ 	 * Properties window.  In either case, the data is static and is set only
+ 	 * the first time we are called.
+ 	 */
+ 	private static void loadProperties() {
+ 		
+ 		//set the property values
+ 		// Note: this may have already been done by another instance of
+ 		// this DataType created to handle a different column.
+ 		if (propertiesAlreadyLoaded == false) {
+ 			// get parameters previously set by user, or set default values
+ 			_readSQLOther = false;	// set to the default
+ 			String readSQLOtherString = DTProperties.get(
+ 				thisClassName, "readSQLOther");
+ 			if (readSQLOtherString != null && readSQLOtherString.equals("true"))
+ 				_readSQLOther = true;
+ 
+ 			propertiesAlreadyLoaded = true;
+ 		}
  	}
  	
***************
*** 280,284 ****
  			
  		String data = null;
! 		if (largeObjInfo.getReadSQLOther())
  		{
  			// Running getObject on a java class attempts
--- 331,335 ----
  			
  		String data = null;
! 		if (_readSQLOther)
  		{
  			// Running getObject on a java class attempts
***************
*** 430,433 ****
  	 	
  		throw new IOException("Can not export data type OTHER");
! 	 }		 
  }
--- 481,573 ----
  	 	
  		throw new IOException("Can not export data type OTHER");
! 	 }	
! 	 
! 
! 	/*
! 	 * Property change control panel
! 	 */	  
! 	 
! 	 /**
! 	  * Generate a JPanel containing controls that allow the user
! 	  * to adjust the properties for this DataType.
! 	  * All properties are static accross all instances of this DataType. 
! 	  * However, the class may choose to apply the information differentially,
! 	  * such as keeping a list (also entered by the user) of table/column names
! 	  * for which certain properties should be used.
! 	  * <P>
! 	  * This is called ONLY if there is at least one property entered into the DTProperties
! 	  * for this class.
! 	  * <P>
! 	  * Since this method is called by reflection on the Method object derived from this class,
! 	  * it does not need to be included in the Interface.
! 	  * It would be nice to include this in the Interface for consistancy, documentation, etc,
! 	  * but the Interface does not seem to like static methods.
! 	  */
! 	 public static OkJPanel getControlPanel() {
! 	 	
! 		/*
! 		 * If you add this method to one of the standard DataTypes in the
! 		 * fw/datasetviewer/cellcomponent directory, you must also add the name
! 		 * of that DataType class to the list in CellComponentFactory, method
! 		 * getControlPanels, variable named initialClassNameList.
! 		 * If the class is being registered with the factory using registerDataType,
! 		 * then you should not include the class name in the list (it will be found
! 		 * automatically), but if the DataType is part of the case statement in the
! 		 * factory method getDataTypeObject, then it does need to be explicitly listed
! 		 * in the getControlPanels method also.
! 		 */
! 		 
! 		 // if this panel is called before any instances of the class have been
! 		 // created, we need to load the properties from the DTProperties.
! 		 loadProperties();
! 		 
! 		return new SQLOtherOkJPanel();
! 	 }
! 	 
! 	 
! 	 
! 	 /**
! 	  * Inner class that extends OkJPanel so that we can call the ok()
! 	  * method to save the data when the user is happy with it.
! 	  */
! 	 private static class SQLOtherOkJPanel extends OkJPanel {
! 		/*
! 		 * GUI components - need to be here because they need to be
! 		 * accessible from the event handlers to alter each other's state.
! 		 */
! 		// check box for whether to read contents during table load or not
! 		private JCheckBox _showSQLOtherChk = new JCheckBox(
! 			"Read contents when table is first loaded and display as string");
! 
! 
! 		public SQLOtherOkJPanel() {
! 		 	 
! 			/* set up the controls */
! 			// checkbox for read/not-read on table load
! 			_showSQLOtherChk.setSelected(_readSQLOther);
! 
! 			/*
! 			 * Create the panel and add the GUI items to it
! 			 */
!  		
! 			setBorder(BorderFactory.createTitledBorder("SQL Other   (SQL type 1111)"));
! 
! 			add(_showSQLOtherChk);
! 
! 		} // end of constructor for inner class
! 	 
! 	 
! 		/**
! 		 * User has clicked OK in the surrounding JPanel,
! 		 * so save the current state of all variables
! 		 */
! 		public void ok() {
! 			// get the values from the controls and set them in the static properties
! 			_readSQLOther = _showSQLOtherChk.isSelected();
! 			DTProperties.put(
! 				thisClassName,
! 				"readSQLOther", Boolean.toString(_readSQLOther));
! 		}
! 	 
! 	 } // end of inner class
  }

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeClob.java,1.7,1.8

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17871

Modified Files:
	DataTypeClob.java 
Log Message:
handle options locally


Index: DataTypeClob.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeClob.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DataTypeClob.java	7 Apr 2004 02:40:50 -0000	1.7
--- DataTypeClob.java	17 May 2004 15:28:56 -0000	1.8
***************
*** 19,22 ****
--- 19,25 ----
   */
  import java.awt.event.*;
+ import java.awt.GridBagLayout;
+ import java.awt.GridBagConstraints;
+ import java.awt.Insets;
  
  import java.io.FileInputStream;
***************
*** 31,34 ****
--- 34,42 ----
  import javax.swing.SwingUtilities;
  import javax.swing.text.JTextComponent;
+ import javax.swing.BorderFactory;
+ import javax.swing.JCheckBox;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.event.ChangeEvent;
+ 
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
***************
*** 37,44 ****
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
- //??import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  
  /**
   * @author gwg
--- 45,56 ----
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
+ import net.sourceforge.squirrel_sql.fw.gui.RightLabel;
+ import net.sourceforge.squirrel_sql.fw.gui.ReadTypeCombo;
+ import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
+ 
  /**
   * @author gwg
***************
*** 90,93 ****
--- 102,138 ----
  	private DefaultColumnRenderer _renderer = DefaultColumnRenderer.getInstance();
  
+ 	/**
+ 	 * Name of this class, which is needed because the class name is needed
+ 	 * by the static method getControlPanel, so we cannot use something
+ 	 * like getClass() to find this name.
+ 	 */
+ 	private static final String thisClassName =
+ 		"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeClob";
+ 
+ 
+ 	/** Default length of CLOB to read */
+ 	private static int LARGE_COLUMN_DEFAULT_READ_LENGTH = 255;
+ 	
+ 	/*
+ 	 * Properties settable by the user
+ 	 */
+ 	// flag for whether we have already loaded the properties or not
+ 	private static boolean propertiesAlreadyLoaded = false;
+ 	  
+ 	/** Read the contents of Clobs from Result sets when first loading the tables. */
+ 	private static  boolean _readClobs = false;
+ 
+ 	/**
+ 	 * If <TT>_readClobs</TT> is <TT>true</TT> this specifies if the complete
+ 	 * CLOB should be read in.
+ 	 */
+ 	private static boolean _readCompleteClobs = false;
+ 
+ 	/**
+ 	 * If <TT>_readClobs</TT> is <TT>true</TT> and <TT>_readCompleteClobs</TT>
+ 	 * is <tt>false</TT> then this specifies the number of characters to read.
+ 	 */
+ 	private static int _readClobsSize = LARGE_COLUMN_DEFAULT_READ_LENGTH;
+ 
  
  	/**
***************
*** 98,101 ****
--- 143,181 ----
  		_colDef = colDef;
  		_isNullable = colDef.isNullable();
+ 		
+ 		loadProperties();
+ 	}
+ 	
+ 	
+ 	/** Internal function to get the user-settable properties from the DTProperties,
+ 	 * if they exist, and to ensure that defaults are set if the properties have
+ 	 * not yet been created.
+ 	 * <P>
+ 	 * This method may be called from different places depending on whether
+ 	 * an instance of this class is created before the user brings up the Session
+ 	 * Properties window.  In either case, the data is static and is set only
+ 	 * the first time we are called.
+ 	 */
+ 	private static void loadProperties() {
+ 		
+ 		if (propertiesAlreadyLoaded == false) {
+ 			// get parameters previously set by user, or set default values
+ 			_readClobs = false;	// set to the default
+ 			String readClobsString = DTProperties.get(thisClassName, "readClobs");
+ 			if (readClobsString != null && readClobsString.equals("true"))
+ 				_readClobs = true;
+ 
+ 			_readCompleteClobs = false;	// set to the default
+ 			String readCompleteClobsString = DTProperties.get(thisClassName, "readCompleteClobs");
+ 			if (readCompleteClobsString != null && readCompleteClobsString.equals("true"))
+ 				_readClobs = true;
+ 		
+ 			_readClobsSize = LARGE_COLUMN_DEFAULT_READ_LENGTH;	// set to default
+ 			String readClobsSizeString = DTProperties.get(thisClassName, "readClobsSize");
+ 			if (readClobsSizeString != null)
+ 				_readClobsSize = Integer.parseInt(readClobsSizeString);
+ 			
+ 			propertiesAlreadyLoaded = true;
+ 		}
  	}
  	
***************
*** 414,418 ****
  		throws java.sql.SQLException {
  		
! 		// We always get the CLOB.
  		// Since the CLOB is just a pointer to the CLOB data rather than the
  		// data itself, this operation should not take much time (as opposed
--- 494,498 ----
  		throws java.sql.SQLException {
  		
! 		// We always get the CLOB, even when we are not reading the contents.
  		// Since the CLOB is just a pointer to the CLOB data rather than the
  		// data itself, this operation should not take much time (as opposed
***************
*** 425,429 ****
  		// CLOB exists, so try to read the data from it
  		// based on the user's directions
! 		if (largeObjInfo.getReadClobs())
  		{
  			// User said to read at least some of the data from the clob
--- 505,509 ----
  		// CLOB exists, so try to read the data from it
  		// based on the user's directions
! 		if (_readClobs)
  		{
  			// User said to read at least some of the data from the clob
***************
*** 435,441 ****
  				{
  					int charsToRead = len;
! 					if (!largeObjInfo.getReadCompleteClobs())
  					{
! 						charsToRead = largeObjInfo.getReadClobsSize();
  					}
  					if (charsToRead > len)
--- 515,521 ----
  				{
  					int charsToRead = len;
! 					if ( ! _readCompleteClobs)
  					{
! 						charsToRead = _readClobsSize;
  					}
  					if (charsToRead > len)
***************
*** 449,458 ****
  			// determine whether we read all there was in the clob or not
  			boolean wholeClobRead = false;
! 			if (largeObjInfo.getReadCompleteClobs() ||
! 				clobData.length() < largeObjInfo.getReadClobsSize())
  				wholeClobRead = true;
  				
  			return new ClobDescriptor(clob, clobData, true, wholeClobRead,
! 				largeObjInfo.getReadClobsSize());
  		}
  		else
--- 529,538 ----
  			// determine whether we read all there was in the clob or not
  			boolean wholeClobRead = false;
! 			if (_readCompleteClobs ||
! 				clobData.length() < _readClobsSize)
  				wholeClobRead = true;
  				
  			return new ClobDescriptor(clob, clobData, true, wholeClobRead,
! 				_readClobsSize);
  		}
  		else
***************
*** 643,645 ****
--- 723,877 ----
  		outWriter.close();
  	 }
+ 
+ 
+ 	/*
+ 	 * Property change control panel
+ 	 */	  
+ 	 
+ 	 /**
+ 	  * Generate a JPanel containing controls that allow the user
+ 	  * to adjust the properties for this DataType.
+ 	  * All properties are static accross all instances of this DataType. 
+ 	  * However, the class may choose to apply the information differentially,
+ 	  * such as keeping a list (also entered by the user) of table/column names
+ 	  * for which certain properties should be used.
+ 	  * <P>
+ 	  * This is called ONLY if there is at least one property entered into the DTProperties
+ 	  * for this class.
+ 	  * <P>
+ 	  * Since this method is called by reflection on the Method object derived from this class,
+ 	  * it does not need to be included in the Interface.
+ 	  * It would be nice to include this in the Interface for consistancy, documentation, etc,
+ 	  * but the Interface does not seem to like static methods.
+ 	  */
+ 	 public static OkJPanel getControlPanel() {
+ 	 	
+ 		/*
+ 		 * If you add this method to one of the standard DataTypes in the
+ 		 * fw/datasetviewer/cellcomponent directory, you must also add the name
+ 		 * of that DataType class to the list in CellComponentFactory, method
+ 		 * getControlPanels, variable named initialClassNameList.
+ 		 * If the class is being registered with the factory using registerDataType,
+ 		 * then you should not include the class name in the list (it will be found
+ 		 * automatically), but if the DataType is part of the case statement in the
+ 		 * factory method getDataTypeObject, then it does need to be explicitly listed
+ 		 * in the getControlPanels method also.
+ 		 */
+ 		 
+ 		 // if this panel is called before any instances of the class have been
+ 		 // created, we need to load the properties from the DTProperties.
+ 		 loadProperties();
+ 		 
+ 		return new ClobOkJPanel();
+ 	 }
+ 	 
+ 	 
+ 	 
+ 	 /**
+ 	  * Inner class that extends OkJPanel so that we can call the ok()
+ 	  * method to save the data when the user is happy with it.
+ 	  */
+ 	 private static class ClobOkJPanel extends OkJPanel {
+ 		/*
+ 		 * GUI components - need to be here because they need to be
+ 		 * accessible from the event handlers to alter each other's state.
+ 		 */
+ 		// check box for whether to read contents during table load or not
+ 		private JCheckBox _showClobChk = new JCheckBox("Read contents when table is first loaded;");
+ 		
+ 		// label for type combo - used to enable/disable text associated with the combo
+ 		private RightLabel _typeDropLabel = new RightLabel("Read");
+ 		
+ 		// Combo box for read-all/read-part of blob
+ 		private ReadTypeCombo _clobTypeDrop = new ReadTypeCombo();
+ 
+ 		// text field for how many bytes of Blob to read
+ 		private IntegerField _showClobSizeField = new IntegerField(5);
+ 	   
+ 
+ 		public ClobOkJPanel() {
+ 		 	 
+ 			/* set up the controls */
+ 			// checkbox for read/not-read on table load
+ 			_showClobChk.setSelected(_readClobs);
+ 			_showClobChk.addChangeListener(new ChangeListener(){
+ 				public void stateChanged(ChangeEvent e) {		
+ 					_clobTypeDrop.setEnabled(_showClobChk.isSelected());
+ 					_typeDropLabel.setEnabled(_showClobChk.isSelected());
+ 					_showClobSizeField.setEnabled(_showClobChk.isSelected() &&
+ 					 (_clobTypeDrop.getSelectedIndex()== 0));	
+ 				}
+ 			});
+ 		
+ 			// Combo box for read-all/read-part of blob
+ 			_clobTypeDrop = new ReadTypeCombo();
+ 			_clobTypeDrop.setSelectedIndex( (_readCompleteClobs) ? 1 : 0 );
+ 			_clobTypeDrop.addActionListener(new ActionListener(){
+ 				public void actionPerformed(ActionEvent e) {		
+ 					_showClobSizeField.setEnabled(_clobTypeDrop.getSelectedIndex()== 0);	
+ 				}
+ 			});
+ 
+ 			_showClobSizeField = new IntegerField(5);	
+ 			_showClobSizeField.setInt(_readClobsSize);
+ 
+ 	 	 
+ 			// handle cross-connection between fields
+ 			_clobTypeDrop.setEnabled(_readClobs);
+ 			_typeDropLabel.setEnabled(_readClobs);
+ 			_showClobSizeField.setEnabled(_readClobs &&  ! _readCompleteClobs);
+ 
+ 			/*
+ 			 * Create the panel and add the GUI items to it
+ 			  */
+ 	 	  
+ 			setLayout(new GridBagLayout());
+ 	 	
+ 			setBorder(BorderFactory.createTitledBorder("CLOB   (SQL type 2005)"));
+ 			final GridBagConstraints gbc = new GridBagConstraints();
+ 			gbc.fill = GridBagConstraints.HORIZONTAL;
+ 			gbc.insets = new Insets(4, 4, 4, 4);
+ 			gbc.anchor = GridBagConstraints.WEST;
+ 
+ 			gbc.gridx = 0;
+ 			gbc.gridy = 0;
+ 
+ 			gbc.gridwidth = 1;
+ 			add(_showClobChk, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(_typeDropLabel, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(_clobTypeDrop, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(_showClobSizeField, gbc);
+ 
+ 		} // end of constructor for inner class
+ 	 
+ 	 
+ 		/**
+ 		  * User has clicked OK in the surrounding JPanel,
+ 		 * so save the current state of all variables
+ 		  */
+ 		public void ok() {
+ 			// get the values from the controls and set them in the static properties
+ 			_readClobs = _showClobChk.isSelected();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"readClobs", Boolean.toString(_readClobs));
+ 			
+ 			_readCompleteClobs = (_clobTypeDrop.getSelectedIndex() == 0) ? false : true;
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"readCompleteClobs", Boolean.toString(_readCompleteClobs));	
+ 		
+ 			_readClobsSize = _showClobSizeField.getInt();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"readClobsSize", Integer.toString(_readClobsSize));
+ 		}
+ 	 
+ 	 } // end of inner class
  }

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeBlob.java,1.2,1.3

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17795

Modified Files:
	DataTypeBlob.java 
Log Message:
handle datatype options locally


Index: DataTypeBlob.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBlob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataTypeBlob.java	7 Apr 2004 02:40:01 -0000	1.2
--- DataTypeBlob.java	17 May 2004 15:28:34 -0000	1.3
***************
*** 19,22 ****
--- 19,25 ----
   */
  import java.awt.event.*;
+ import java.awt.GridBagConstraints;
+ import java.awt.GridBagLayout;
+ import java.awt.Insets;
  
  import java.io.FileInputStream;
***************
*** 29,32 ****
--- 32,40 ----
  import javax.swing.SwingUtilities;
  import javax.swing.text.JTextComponent;
+ import javax.swing.BorderFactory;
+ import javax.swing.JCheckBox;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.event.ChangeEvent;
+ 
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
***************
*** 34,39 ****
  import java.io.ByteArrayInputStream;
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
- //??import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
--- 42,51 ----
  import java.io.ByteArrayInputStream;
  
+ import net.sourceforge.squirrel_sql.fw.gui.RightLabel;
+ import net.sourceforge.squirrel_sql.fw.gui.ReadTypeCombo;
+ import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
+ 
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
***************
*** 88,91 ****
--- 100,140 ----
  	private DefaultColumnRenderer _renderer = DefaultColumnRenderer.getInstance();
  
+ 	/**
+ 	 * Name of this class, which is needed because the class name is needed
+ 	 * by the static method getControlPanel, so we cannot use something
+ 	 * like getClass() to find this name.
+ 	 */
+ 	private static final String thisClassName =
+ 		"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeBlob";
+ 
+ 
+ 	/** Default length of BLOB to read */
+ 	private static int LARGE_COLUMN_DEFAULT_READ_LENGTH = 255;
+ 
+ 	/*
+ 	 * Properties settable by the user
+ 	 */
+ 	 // flag for whether we have already loaded the properties or not
+ 	 private static boolean propertiesAlreadyLoaded = false;
+ 	 
+ 		 
+ 	/** Read the contents of Blobs from Result sets when first loading the tables. */
+ 	private static boolean _readBlobs = false;
+ 
+ 	/**
+ 	 * If <TT>_readBlobs</TT> is <TT>true</TT> this specifies if the complete
+ 	 * BLOB should be read in.
+ 	 */
+ 	private static boolean _readCompleteBlobs = false;
+ 
+ 	/**
+ 	 * If <TT>_readBlobs</TT> is <TT>true</TT> and <TT>_readCompleteBlobs</TT>
+ 	 * is <tt>false</TT> then this specifies the number of characters to read.
+ 	 */
+ 	private static int _readBlobsSize = LARGE_COLUMN_DEFAULT_READ_LENGTH;
+ 
+ 	 
+ 
+ 	 
  
  	/**
***************
*** 96,99 ****
--- 145,188 ----
  		_colDef = colDef;
  		_isNullable = colDef.isNullable();
+ 		
+ 		loadProperties();
+ 	}
+ 	
+ 	/** Internal function to get the user-settable properties from the DTProperties,
+ 	 * if they exist, and to ensure that defaults are set if the properties have
+ 	 * not yet been created.
+ 	 * <P>
+ 	 * This method may be called from different places depending on whether
+ 	 * an instance of this class is created before the user brings up the Session
+ 	 * Properties window.  In either case, the data is static and is set only
+ 	 * the first time we are called.
+ 	 */
+ 	private static void loadProperties() {
+ 		
+ 		//set the property values
+ 		// Note: this may have already been done by another instance of
+ 		// this DataType created to handle a different column.
+ 		if (propertiesAlreadyLoaded == false) {
+ 			// get parameters previously set by user, or set default values
+ 			_readBlobs = false;	// set to the default
+ 			String readBlobsString = DTProperties.get(
+ 				thisClassName, "readBlobs");
+ 			if (readBlobsString != null && readBlobsString.equals("true"))
+ 				_readBlobs = true;
+ 
+ 			_readCompleteBlobs = false;	// set to the default
+ 			String readCompleteBlobsString = DTProperties.get(
+ 				thisClassName, "readCompleteBlobs");
+ 			if (readCompleteBlobsString != null && readCompleteBlobsString.equals("true"))
+ 				_readCompleteBlobs = true;
+ 		
+ 			_readBlobsSize = LARGE_COLUMN_DEFAULT_READ_LENGTH;	// set to default
+ 			String readBlobsSizeString = DTProperties.get(
+ 				thisClassName, "readBlobsSize");
+ 			if (readBlobsSizeString != null)
+ 				_readBlobsSize = Integer.parseInt(readBlobsSizeString);
+ 
+ 			propertiesAlreadyLoaded = true;
+ 		}
  	}
  	
***************
*** 409,413 ****
  		throws java.sql.SQLException {
  		
! 		// We always get the BLOB.
  		// Since the BLOB is just a pointer to the BLOB data rather than the
  		// data itself, this operation should not take much time (as opposed
--- 498,502 ----
  		throws java.sql.SQLException {
  		
! 		// We always get the BLOB, even when we are not reading the contents.
  		// Since the BLOB is just a pointer to the BLOB data rather than the
  		// data itself, this operation should not take much time (as opposed
***************
*** 420,424 ****
  		// BLOB exists, so try to read the data from it
  		// based on the user's directions
! 		if (largeObjInfo.getReadBlobs())
  		{
  			// User said to read at least some of the data from the blob
--- 509,513 ----
  		// BLOB exists, so try to read the data from it
  		// based on the user's directions
! 		if (_readBlobs)
  		{
  			// User said to read at least some of the data from the blob
***************
*** 430,436 ****
  				{
  					int charsToRead = len;
! 					if (!largeObjInfo.getReadCompleteBlobs())
  					{
! 						charsToRead = largeObjInfo.getReadBlobsSize();
  					}
  					if (charsToRead > len)
--- 519,525 ----
  				{
  					int charsToRead = len;
! 					if (! _readCompleteBlobs)
  					{
! 						charsToRead = _readBlobsSize;
  					}
  					if (charsToRead > len)
***************
*** 444,453 ****
  			// determine whether we read all there was in the blob or not
  			boolean wholeBlobRead = false;
! 			if (largeObjInfo.getReadCompleteBlobs() ||
! 				blobData.length < largeObjInfo.getReadBlobsSize())
  				wholeBlobRead = true;
  				
  			return new BlobDescriptor(blob, blobData, true, wholeBlobRead,
! 				largeObjInfo.getReadBlobsSize());
  		}
  		else
--- 533,542 ----
  			// determine whether we read all there was in the blob or not
  			boolean wholeBlobRead = false;
! 			if (_readCompleteBlobs ||
! 				blobData.length < _readBlobsSize)
  				wholeBlobRead = true;
  				
  			return new BlobDescriptor(blob, blobData, true, wholeBlobRead,
! 				_readBlobsSize);
  		}
  		else
***************
*** 627,629 ****
--- 716,872 ----
  	   outStream.close();
  	}
+ 	
+ 
+ 	/*
+ 	 * Property change control panel
+ 	 */	  
+ 	 
+ 	 /**
+ 	  * Generate a JPanel containing controls that allow the user
+ 	  * to adjust the properties for this DataType.
+ 	  * All properties are static accross all instances of this DataType. 
+ 	  * However, the class may choose to apply the information differentially,
+ 	  * such as keeping a list (also entered by the user) of table/column names
+ 	  * for which certain properties should be used.
+ 	  * <P>
+ 	  * This is called ONLY if there is at least one property entered into the DTProperties
+ 	  * for this class.
+ 	  * <P>
+ 	  * Since this method is called by reflection on the Method object derived from this class,
+ 	  * it does not need to be included in the Interface.
+ 	  * It would be nice to include this in the Interface for consistancy, documentation, etc,
+ 	  * but the Interface does not seem to like static methods.
+ 	  */
+ 	 public static OkJPanel getControlPanel() {
+ 	 	
+ 		/*
+ 		 * If you add this method to one of the standard DataTypes in the
+ 		 * fw/datasetviewer/cellcomponent directory, you must also add the name
+ 		 * of that DataType class to the list in CellComponentFactory, method
+ 		 * getControlPanels, variable named initialClassNameList.
+ 		 * If the class is being registered with the factory using registerDataType,
+ 		 * then you should not include the class name in the list (it will be found
+ 		 * automatically), but if the DataType is part of the case statement in the
+ 		 * factory method getDataTypeObject, then it does need to be explicitly listed
+ 		 * in the getControlPanels method also.
+ 		 */
+ 		 
+ 		 // if this panel is called before any instances of the class have been
+ 		 // created, we need to load the properties from the DTProperties.
+ 		 loadProperties();
+ 		 
+ 		return new BlobOkJPanel();
+ 	 }
+ 	 
+ 	 
+ 	 
+ 	 /**
+ 	  * Inner class that extends OkJPanel so that we can call the ok()
+ 	  * method to save the data when the user is happy with it.
+ 	  */
+ 	 private static class BlobOkJPanel extends OkJPanel {
+ 		/*
+ 		 * GUI components - need to be here because they need to be
+ 		 * accessible from the event handlers to alter each other's state.
+ 		 */
+ 	   // check box for whether to read contents during table load or not
+ 	  private JCheckBox _showBlobChk = new JCheckBox(
+ 		"Read contents when table is first loaded:");
+ 		
+ 		// label for type combo - used to enable/disable text associated with the combo
+ 		private RightLabel _typeDropLabel = new RightLabel("Read");
+ 				
+ 		// Combo box for read-all/read-part of blob
+ 		private ReadTypeCombo _blobTypeDrop = new ReadTypeCombo();
+ 
+ 		// text field for how many bytes of Blob to read
+ 		private IntegerField _showBlobSizeField = new IntegerField(5);
+ 	   
+ 
+ 		public BlobOkJPanel() {
+ 		 	 
+ 			/* set up the controls */
+ 			// checkbox for read/not-read on table load
+ 			_showBlobChk.setSelected(_readBlobs);
+ 			_showBlobChk.addChangeListener(new ChangeListener(){
+ 				public void stateChanged(ChangeEvent e) {		
+ 				_blobTypeDrop.setEnabled(_showBlobChk.isSelected());
+ 				_typeDropLabel.setEnabled(_showBlobChk.isSelected());
+ 				_showBlobSizeField.setEnabled(_showBlobChk.isSelected() &&
+ 					(_blobTypeDrop.getSelectedIndex()== 0));	
+ 				}
+ 			});
+ 		
+ 			// Combo box for read-all/read-part of blob
+ 			_blobTypeDrop = new ReadTypeCombo();
+ 			_blobTypeDrop.setSelectedIndex( (_readCompleteBlobs) ? 1 : 0 );
+ 			_blobTypeDrop.addActionListener(new ActionListener(){
+ 				public void actionPerformed(ActionEvent e) {		
+ 					_showBlobSizeField.setEnabled(_blobTypeDrop.getSelectedIndex()== 0);	
+ 				}
+ 			});
+ 
+ 			_showBlobSizeField = new IntegerField(5);	
+ 			_showBlobSizeField.setInt(_readBlobsSize);
+ 
+ 	 	 
+ 			// handle cross-connection between fields
+ 			_blobTypeDrop.setEnabled(_readBlobs);
+ 			_typeDropLabel.setEnabled(_readBlobs);
+ 			_showBlobSizeField.setEnabled(_readBlobs &&  ! _readCompleteBlobs);
+ 
+ 			/*
+ 			  * Create the panel and add the GUI items to it
+ 			 */
+ 	 	  
+ 			setLayout(new GridBagLayout());
+ 	 	
+ 			setBorder(BorderFactory.createTitledBorder("BLOB   (SQL type 2004)"));
+ 			final GridBagConstraints gbc = new GridBagConstraints();
+ 			gbc.fill = GridBagConstraints.HORIZONTAL;
+ 			gbc.insets = new Insets(4, 4, 4, 4);
+ 			gbc.anchor = GridBagConstraints.WEST;
+ 
+ 			gbc.gridx = 0;
+ 			gbc.gridy = 0;
+ 
+ 			gbc.gridwidth = 1;
+ 			add(_showBlobChk, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(_typeDropLabel, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(_blobTypeDrop, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(_showBlobSizeField, gbc);
+ 
+ 		} // end of constructor for inner class
+ 	 
+ 	 
+ 		/**
+ 		  * User has clicked OK in the surrounding JPanel,
+ 		  * so save the current state of all variables
+ 		  */
+ 		public void ok() {
+ 			// get the values from the controls and set them in the static properties
+ 			_readBlobs = _showBlobChk.isSelected();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"readBlobs", Boolean.toString(_readBlobs));
+ 			
+ 		
+ 			_readCompleteBlobs = (_blobTypeDrop.getSelectedIndex() == 0) ? false : true;
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"readCompleteBlobs", Boolean.toString(_readCompleteBlobs));	
+ 		
+ 			_readBlobsSize = _showBlobSizeField.getInt();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"readBlobsSize", Integer.toString(_readBlobsSize));
+ 		}
+ 	 
+ 	 } // end of inner class
  }

[Squirrel-sql-commits] sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion CodeCompletionPlugin.java,1.1,1.2

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

Update of /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32525/src/net/sourceforge/squirrel_sql/plugins/codecompletion

Modified Files:
	CodeCompletionPlugin.java 
Log Message:
clean up


Index: CodeCompletionPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CodeCompletionPlugin.java	24 Nov 2003 10:53:13 -0000	1.1
--- CodeCompletionPlugin.java	16 May 2004 16:22:56 -0000	1.2
***************
*** 38,45 ****
  			s_log = LoggerController.createLogger(CodeCompletionPlugin.class);
  
! 	private interface IMenuResourceKeys 
! 	{
! 		String MENU = "editextras";
! 	}
  
  	/** Name of file to store user prefs in. */
--- 38,42 ----
  			s_log = LoggerController.createLogger(CodeCompletionPlugin.class);
  
! 
  
  	/** Name of file to store user prefs in. */
***************
*** 79,82 ****
--- 76,90 ----
  	}
  
+ 
+    /**
+     * Returns a comma separated list of other contributors.
+     *
+     * @return      Contributors names.
+     */
+    public String getContributors()
+    {
+       return "Christian Sell";
+    }
+ 
  	/**
  	 * Returns the authors name.

[Squirrel-sql-commits] sql12/plugins/codecompletion/doc changes.txt,1.1,1.2

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

Update of /cvsroot/squirrel-sql/sql12/plugins/codecompletion/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32525/doc

Modified Files:
	changes.txt 
Log Message:
clean up


Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/doc/changes.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** changes.txt	24 Nov 2003 10:53:13 -0000	1.1
--- changes.txt	16 May 2004 16:22:56 -0000	1.2
***************
*** 6,7 ****
--- 6,11 ----
  ====
  - Initial release
+ - completes on table and view aliases
+ - completes on schemas and catalogs
+ 
+ 

[Squirrel-sql-commits] sql12/plugins/codecompletion plugin_build.xml,1.1,1.2

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

Update of /cvsroot/squirrel-sql/sql12/plugins/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32525

Modified Files:
	plugin_build.xml 
Log Message:
clean up


Index: plugin_build.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/plugin_build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin_build.xml	24 Nov 2003 10:53:13 -0000	1.1
--- plugin_build.xml	16 May 2004 16:22:56 -0000	1.2
***************
*** 1,5 ****
  <?xml version="1.0"?>
  <!--
!     This is an Apache Ant build file to build the edit extras plugin
      for distribution.
  -->
--- 1,5 ----
  <?xml version="1.0"?>
  <!--
!     This is an Apache Ant build file to build the code completion plugin
      for distribution.
  -->
***************
*** 14,20 ****
          <property name="deprecation" value="on"/>
  
!         <property name="p_plugin.work_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql-1.2beta4/codecompletion"/>
!         <property name="p_plugin.core_libs_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql-1.2beta4/core/dist/lib"/>
!         <property name="p_plugin.dist_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql-1.2beta4/core/dist/plugins"/>
  
  
--- 14,20 ----
          <property name="deprecation" value="on"/>
  
!         <property name="p_plugin.work_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql-1.2beta5/codecompletion"/>
!         <property name="p_plugin.core_libs_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql-1.2beta5/core/dist/lib"/>
!         <property name="p_plugin.dist_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql-1.2beta5/core/dist/plugins"/>
  
  

[Squirrel-sql-commits] sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/oster KeyManager.java,NONE,1.1 OsterTextControl.java,1.9,1.10

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

Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/oster
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27781

Modified Files:
	OsterTextControl.java 
Added Files:
	KeyManager.java 
Log Message:
Improved handling of ctrl left/right arrow keys.


Index: OsterTextControl.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/oster/OsterTextControl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OsterTextControl.java	4 Apr 2004 10:37:58 -0000	1.9
--- OsterTextControl.java	16 May 2004 15:59:16 -0000	1.10
***************
*** 124,128 ****
  	private Vector _currentErrorInfos = new Vector();
  
! 	OsterTextControl(ISession session, SyntaxPreferences prefs)
  	{
  		super();
--- 124,129 ----
  	private Vector _currentErrorInfos = new Vector();
  
! 
!    OsterTextControl(ISession session, SyntaxPreferences prefs)
  	{
  		super();
***************
*** 158,161 ****
--- 159,164 ----
  			}
  		});
+       
+       new KeyManager(this);
  	}
  

--- NEW FILE: KeyManager.java ---
package net.sourceforge.squirrel_sql.plugins.syntax.oster;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.FocusListener;
import java.awt.event.FocusEvent;


/**
 * Manages the ctrl left/right and ctrl shift left/right keys.
 */
public class KeyManager
{
   public static final char[] STOP_AT = new char[]{'.', '(', ')' , '\'', '\n', ',', '=', '<', '>'};

   private JTextPane _textPane;


   KeyManager(JTextPane textPane)
   {
      _textPane = textPane;

      // One may ask why we don't register the key strokes permanently.
      // When we did so with two internal frames open, the key stroke event
      // sometimes went to the wrong frame. This doesn't happen if we procede
      // like we do.
      // The question is, why?

      _textPane.addFocusListener(new FocusListener()
      {
         public void focusGained(FocusEvent e)
         {
            registerKeyStrokes();
         }

         public void focusLost(FocusEvent e)
         {
            unregisterKeyStrokes();
         }
      });


   }

   private void unregisterKeyStrokes()
   {
      KeyStroke keyStroke;

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.CTRL_MASK);
      _textPane.getKeymap().removeKeyStrokeBinding(keyStroke);

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.CTRL_MASK | Event.SHIFT_MASK);
      _textPane.getKeymap().removeKeyStrokeBinding(keyStroke);

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.CTRL_MASK);
      _textPane.getKeymap().removeKeyStrokeBinding(keyStroke);

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.CTRL_MASK | Event.SHIFT_MASK);
      _textPane.getKeymap().removeKeyStrokeBinding(keyStroke);
   }

   private void registerKeyStrokes()
   {
      KeyStroke keyStroke;
      Action act;

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.CTRL_MASK);
      act  = new AbstractAction()
      {
         public void actionPerformed(ActionEvent e)
         {
            onRightCtrl();
         }
      };
      _textPane.getKeymap().addActionForKeyStroke(keyStroke,act);

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.CTRL_MASK | Event.SHIFT_MASK);
      act  = new AbstractAction()
      {
         public void actionPerformed(ActionEvent e)
         {
            onRightCtrlShift();
         }
      };
      _textPane.getKeymap().addActionForKeyStroke(keyStroke,act);

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.CTRL_MASK);
      act  = new AbstractAction()
      {
         public void actionPerformed(ActionEvent e)
         {
            onLeftCtrl();
         }
      };
      _textPane.getKeymap().addActionForKeyStroke(keyStroke,act);

      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.CTRL_MASK | Event.SHIFT_MASK);
      act  = new AbstractAction()
      {
         public void actionPerformed(ActionEvent e)
         {
            onLeftCtrlShift();
         }
      };
      _textPane.getKeymap().addActionForKeyStroke(keyStroke,act);
   }

   private void onLeftCtrlShift()
   {
      moveCtrlLeft(true);
   }

   private void onLeftCtrl()
   {
      moveCtrlLeft(false);
   }

   private void moveCtrlLeft(boolean select)
   {
      String text = _textPane.getText();
      int pos = _textPane.getCaretPosition() - 1;

      if(pos < 0 )
      {
         return;
      }


      for(; pos > 0; --pos)
      {
         if(isToStopAt(text.charAt(pos-1), text.charAt(pos)))
         {
            break;
         }
      }

      if(select)
      {
         _textPane.moveCaretPosition(pos);
      }
      else
      {
         _textPane.setCaretPosition(pos);
      }
   }

   private void onRightCtrlShift()
   {
      moveCtrlRight(true);
   }

   private void onRightCtrl()
   {
      moveCtrlRight(false);
   }

   private void moveCtrlRight(boolean select)
   {
      String text = _textPane.getText();
      int pos = _textPane.getCaretPosition() + 1;

      if(pos > text.length())
      {
         return;
      }


      for(; pos < text.length(); ++pos)
      {
         if(isToStopAt(text.charAt(pos), text.charAt(pos-1)))
         {
            break;
         }
      }

      if(select)
      {
         _textPane.moveCaretPosition(pos);
      }
      else
      {
         _textPane.setCaretPosition(pos);
      }
   }

   private boolean isToStopAt(char toCheck, char former)
   {
      if(isInStopAtArray(former) || isInStopAtArray(toCheck))
      {
         return true;
      }
      else if(false == Character.isWhitespace(former) && Character.isWhitespace(toCheck)  ||
              Character.isWhitespace(former) && false == Character.isWhitespace(toCheck)  )
 //     else if(Character.isWhitespace(former) && false == Character.isWhitespace(toCheck))
      {
         return true;
      }

      return false;
   }

   private boolean isInStopAtArray(char toCheck)
   {
      for (int i = 0; i < STOP_AT.length; i++)
      {
         if(toCheck == STOP_AT[i])
         {
            return true;
         }
      }

      return false;
   }


}

[Squirrel-sql-commits] sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras EscapeDateAction.java,NONE,1.1 EscapeDateController.java,NONE,1.1 EscapeDateFrame.java,NONE,1.1 EditExtrasPlugin.java,1.6,1.7 Resources.properties,1.2,1.3

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

Update of /cvsroot/squirrel-sql/sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19968

Modified Files:
	EditExtrasPlugin.java Resources.properties 
Added Files:
	EscapeDateAction.java EscapeDateController.java 
	EscapeDateFrame.java 
Log Message:
New right mouse click item in SQL entry area: 'Escape date'



--- NEW FILE: EscapeDateController.java ---
package net.sourceforge.squirrel_sql.plugins.editextras;

import net.sourceforge.squirrel_sql.client.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;

import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Calendar;


public class EscapeDateController
{
   private EscapeDateFrame _frame;
   private ISession _session;


   public EscapeDateController(ISession session, MainFrame mainFrame)
   {
      _session = session;
      _frame = new EscapeDateFrame(mainFrame);

      _frame.btnTimestamp.addActionListener(new ActionListener()
      {
         public void actionPerformed(ActionEvent e)
         {
            onTimeStamp();
         }
      });
      _frame.btnDate.addActionListener(new ActionListener()
      {
         public void actionPerformed(ActionEvent e)
         {
            onDate();
         }
      });
      _frame.btnTime.addActionListener(new ActionListener()
      {
         public void actionPerformed(ActionEvent e)
         {
            onTime();
         }
      });

      Calendar cal = Calendar.getInstance();

      _frame.txtYear.setText("" + cal.get(Calendar.YEAR));
      _frame.txtMonth.setText("" + (cal.get(Calendar.MONTH) + 1));
      _frame.txtDay.setText("" + cal.get(Calendar.DAY_OF_MONTH));
      _frame.txtHour.setText("" + cal.get(Calendar.HOUR_OF_DAY));
      _frame.txtMinute.setText("" + cal.get(Calendar.MINUTE));
      _frame.txtSecond.setText("" + cal.get(Calendar.SECOND));

      GUIUtils.centerWithinParent(_frame);
      _frame.setVisible(true);

   }

   private String prefixNulls(String toPrefix, int digitCount)
   {
      String ret = "" + toPrefix;

      while(ret.length() < digitCount)
      {
         ret = 0 + ret;
      }

      return ret;
   }

   private void onTime()
   {
      String esc = "{t '" + prefixNulls(_frame.txtHour.getText(), 2) + ":" +
                            prefixNulls(_frame.txtMinute.getText(), 2) + ":" +
                            prefixNulls(_frame.txtSecond.getText(),2) + "'}";

      _session.getSQLEntryPanel().replaceSelection(esc);
      _frame.setVisible(false);
      _frame.dispose();
   }

   private void onDate()
   {
      String esc = "{d '" + prefixNulls(_frame.txtYear.getText(), 4) + "-" +
                            prefixNulls(_frame.txtMonth.getText(), 2) + "-" +
                            prefixNulls(_frame.txtDay.getText(), 2) + "'}";

      _session.getSQLEntryPanel().replaceSelection(esc);
      _frame.setVisible(false);
      _frame.dispose();
   }

   private void onTimeStamp()
   {
      String esc = "{ts '" + prefixNulls(_frame.txtYear.getText(), 4) + "-" +
                             prefixNulls(_frame.txtMonth.getText(), 2) + "-" +
                             prefixNulls(_frame.txtDay.getText(), 2) + " "+
                             prefixNulls(_frame.txtHour.getText(), 2) + ":" +
                             prefixNulls(_frame.txtMinute.getText(), 2) + ":" +
                             prefixNulls(_frame.txtSecond.getText(), 2) + "'}";

      _session.getSQLEntryPanel().replaceSelection(esc);
      _frame.setVisible(false);
      _frame.dispose();
   }

}

Index: EditExtrasPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras/EditExtrasPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EditExtrasPlugin.java	26 Apr 2004 12:49:10 -0000	1.6
--- EditExtrasPlugin.java	16 May 2004 10:22:50 -0000	1.7
***************
*** 252,255 ****
--- 252,259 ----
  		coll.add(act);
  		_resources.addToMenu(act, menu);
+ 
+       act = new EscapeDateAction(getApplication(), _resources);
+       coll.add(act);
+       _resources.addToMenu(act, menu);
  	}
  
***************
*** 262,265 ****
--- 266,270 ----
  		api.addToSQLEntryAreaMenu(actions.get(ConvertToStringBufferAction.class));
  		api.addToSQLEntryAreaMenu(actions.get(FormatSQLAction.class));
+       api.addToSQLEntryAreaMenu(actions.get(EscapeDateAction.class));
  	}
  

Index: Resources.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras/Resources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Resources.properties	27 Apr 2004 21:13:24 -0000	1.2
--- Resources.properties	16 May 2004 10:22:50 -0000	1.3
***************
*** 36,39 ****
--- 36,41 ----
  action.net.sourceforge.squirrel_sql.plugins.editextras.searchandreplace.ReplaceAction.tooltip=Replace ...
  
+ action.net.sourceforge.squirrel_sql.plugins.editextras.EscapeDateAction.name=Escape Date
+ action.net.sourceforge.squirrel_sql.plugins.editextras.EscapeDateAction.tooltip=Create Escape for Date/Time/TimeStamp
  
  ########
***************
*** 71,72 ****
--- 73,76 ----
  menuitem.net.sourceforge.squirrel_sql.plugins.editextras.searchandreplace.ReplaceAction.mnemonic=
  
+ menuitem.net.sourceforge.squirrel_sql.plugins.editextras.EscapeDateAction.accelerator=
+ menuitem.net.sourceforge.squirrel_sql.plugins.editextras.EscapeDateAction.mnemonic=E

--- NEW FILE: EscapeDateAction.java ---
package net.sourceforge.squirrel_sql.plugins.editextras;

import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;

import java.awt.event.ActionEvent;


public class EscapeDateAction extends SquirrelAction implements ISessionAction
{
   private ISession _session;

   public EscapeDateAction(IApplication app, net.sourceforge.squirrel_sql.fw.util.Resources rsrc)
   {
      super(app, rsrc);
   }

   public void actionPerformed(ActionEvent e)
   {
      new EscapeDateController(_session, getApplication().getMainFrame());
   }

   public void setSession(ISession session)
   {
      _session = session;
   }
}

--- NEW FILE: EscapeDateFrame.java ---
package net.sourceforge.squirrel_sql.plugins.editextras;

import javax.swing.*;
import java.awt.*;


public class EscapeDateFrame extends JDialog
{
    JTextField txtYear = new JTextField();
    JTextField txtMonth = new JTextField();
    JTextField txtDay = new JTextField();
    JTextField txtHour = new JTextField();
    JTextField txtMinute = new JTextField();
    JTextField txtSecond = new JTextField();
    JButton btnTimestamp = new JButton("Time stamp");
    JButton btnDate = new JButton("Date");
    JButton btnTime = new JButton("Time");

   public EscapeDateFrame(Frame owner)
   {
      super(owner, "Escape date");

      JPanel pnlEdit = new JPanel();

      pnlEdit.setLayout(new GridLayout(6,2));

      pnlEdit.add(new JLabel("Year"));
      pnlEdit.add(txtYear);
      pnlEdit.add(new JLabel("Month"));
      pnlEdit.add(txtMonth);
      pnlEdit.add(new JLabel("Day"));
      pnlEdit.add(txtDay);
      pnlEdit.add(new JLabel("Hour"));
      pnlEdit.add(txtHour);
      pnlEdit.add(new JLabel("Minute"));
      pnlEdit.add(txtMinute);
      pnlEdit.add(new JLabel("Second"));
      pnlEdit.add(txtSecond);

      JPanel pnlButtons = new JPanel(new GridLayout(3,1));
      pnlButtons.add(btnTimestamp);
      pnlButtons.add(btnDate);
      pnlButtons.add(btnTime);

      JPanel pnlMain = new JPanel();
      pnlMain.setLayout(new BorderLayout());

      pnlMain.add(pnlEdit, BorderLayout.CENTER);
      pnlMain.add(pnlButtons, BorderLayout.SOUTH);

      getContentPane().add(pnlMain);
      setSize(250, 250);

      getRootPane().setDefaultButton(btnTimestamp);

   }
}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DTProperties.java,1.3,1.4

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29618

Modified Files:
	DTProperties.java 
Log Message:
minor cleanup


Index: DTProperties.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DTProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DTProperties.java	13 May 2004 17:00:32 -0000	1.3
--- DTProperties.java	15 May 2004 14:31:22 -0000	1.4
***************
*** 57,64 ****
  import java.util.Iterator;
  
- import java.lang.reflect.Method;
- 
- import javax.swing.JPanel;
- 
  public class DTProperties {
  	
--- 57,60 ----

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui ReadTypeCombo.java,NONE,1.1

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28540

Added Files:
	ReadTypeCombo.java 
Log Message:
widget for DataType control panels


--- NEW FILE: ReadTypeCombo.java ---
package net.sourceforge.squirrel_sql.fw.gui;
/*
 * Copyright (C) 2004 Colin Bell
 * co...@us...
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 import javax.swing.JComboBox;
 
public class ReadTypeCombo extends JComboBox
{
	static final int READ_ALL_IDX = 1;
	static final int READ_PARTIAL_IDX = 0;

	public ReadTypeCombo()
	{
		addItem("only the first");
		addItem("all");
	}
}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui OkJPanel.java,NONE,1.1

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28445

Added Files:
	OkJPanel.java 
Log Message:
widget for DataType control panels


--- NEW FILE: OkJPanel.java ---

package net.sourceforge.squirrel_sql.fw.gui;
/*
 * Copyright (C) 2001-2004 Colin Bell
 * co...@us...
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
import javax.swing.JPanel;

/**
 * A JPanel with a method that can be called by a surrounding JPanel
 * to indicate that the user has selected "OK" in a higher-level context,
 * such as a panel containing this panel.
 */
public abstract class OkJPanel extends JPanel {
	
	// User has clicked OK button, so apply changes
	// made within this particular panel
	public void ok() {
	}

}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui RightLabel.java,NONE,1.1

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28251

Added Files:
	RightLabel.java 
Log Message:
GUI widget for Datatype panels


--- NEW FILE: RightLabel.java ---
package net.sourceforge.squirrel_sql.fw.gui;
/*
 * Copyright (C) 2004 Colin Bell
 * co...@us...
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 
 
public class RightLabel extends JLabel
{
	public RightLabel(String title)
	{
		super(title, SwingConstants.RIGHT);
	}
}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent CellComponentFactory.java,1.23,1.24

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22065

Modified Files:
	CellComponentFactory.java 
Log Message:
add getControlPanels so panels can be found before instances of DataTypes created


Index: CellComponentFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CellComponentFactory.java	11 May 2004 14:26:57 -0000	1.23
--- CellComponentFactory.java	13 May 2004 17:01:26 -0000	1.24
***************
*** 8,11 ****
--- 8,13 ----
  import javax.swing.JTextArea;
  import javax.swing.JLabel;
+ import javax.swing.JPanel;
+ 
  import java.awt.Component;
  import java.sql.Types;
***************
*** 19,24 ****
--- 21,30 ----
  import java.io.IOException;
  import java.lang.reflect.Constructor;
+ import java.lang.reflect.Method;
  
  import java.util.HashMap;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.Arrays;
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DefaultColumnRenderer;
***************
*** 653,657 ****
--- 659,722 ----
  	 	}
  	 }
+ 	 
  
+ 	/*
+ 	 * Get control panels to let user adjust properties
+ 	 * on DataType classes.
+ 	 */
+ 	 
+ 	 /**
+ 	  * Get the Control Panels (JPanels containing controls) that let the
+ 	  * user adjust the properties of static properties in specific DataTypes.
+ 	  * The only DataType objects checked for here are:
+ 	  * 	- those that are registered through the registerDataType method, and
+ 	  * 	- those that are specifically listed in the variable initialClassNameList
+ 	  */
+ 	 public static JPanel[] getControlPanels() {
+ 		ArrayList panelList = new ArrayList();
+ 		
+ 		/*
+ 		 * This is the list of names of classes that:
+ 		 * 	- support standard SQL type codes and thus do not need to be registered
+ 		 * 	- provide the getControlPanel method to allow manipulation of properties
+ 		 * These classes should all be named
+ 		 * 	net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeXXXX
+ 		 * because they are part of the standard delivery of the product, and thus should
+ 		 * be local to this directory.
+ 		 */
+ 		String [] initialClassNameList = {
+ 			"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeBlob",
+ 			"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeClob",
+ 			"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeOther",
+ 			"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeUnknown",
+ 			 };
+ 		
+ 		// make a single list of all class names that we need to check.
+ 		// Start with the names of known, standard classes that provide Control Panels
+ 		ArrayList classNameList = new ArrayList(Arrays.asList(initialClassNameList));
+ 		
+ 		// add to that the list of all names that have been registered by plugins
+ 		Iterator classNames = _registeredDataTypes.keySet().iterator();
+ 		while (classNames.hasNext())
+ 			classNameList.add(classNames.next());
+ 		
+ 		// Now go through the list in the given order to get the panels
+ 		for (int i=0; i< classNameList.size(); i++) {
+ 			String className = (String)classNameList.get(i);
+ 			Class[] parameterTypes = new Class[0];
+ 			try {
+ 				Method panelMethod =
+ 					Class.forName(className).getMethod("getControlPanel", parameterTypes);
+ 					
+ 				JPanel panel = (JPanel)panelMethod.invoke(null, null);
+ 				panelList.add(panel);
+ 			}
+ 			catch (Exception e) {
+ 				// assume that errors here are not fatal and ignore them??
+ 			}
+ 		}
+ 		
+ 		return (JPanel[])panelList.toArray(new JPanel[0]);
+ 	}
  
  

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DTProperties.java,1.2,1.3

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21926

Modified Files:
	DTProperties.java 
Log Message:
remove getControlPanels to factory


Index: DTProperties.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DTProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DTProperties.java	13 May 2004 00:30:44 -0000	1.2
--- DTProperties.java	13 May 2004 17:00:32 -0000	1.3
***************
*** 178,212 ****
  		return (String)h.get(propertyName);
  	}
- 	
- 	/**
- 	 * Get the panels containing the controls needed to adjust all of the properties.
- 	 * This assumes that the only DataTypes that want to put up control panels
- 	 * are the ones that have properties to be adjusted.
- 	 * We do not assume that all properties require a panel.
- 	 * When this method calls the DataType class to get the panel, the class may return null.
- 	 */
- 	public static JPanel[] getControlPanels() {
- 		ArrayList panelList = new ArrayList();
- 		
- 		// get a unique set of names of classes with properties
- 		Iterator classNames = dataTypes.keySet().iterator();
  		
- 		// run through the list getting the panel from each of the named classes
- 		while (classNames.hasNext()) {
- 			String className = (String)classNames.next();
- 			Class[] parameterTypes = new Class[0];
- 			try {
- 				Method panelMethod =
- 					Class.forName(className).getMethod("getControlPanel", parameterTypes);
- 					
- 				JPanel panel = (JPanel)panelMethod.invoke(null, null);
- 				panelList.add(panel);
- 			}
- 			catch (Exception e) {
- 				// assume that errors here are not fatal and ignore them??
- 			}
- 		}
- 		
- 		return (JPanel[])panelList.toArray(new JPanel[0]);
- 	}
  }
--- 178,181 ----

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DTProperties.java,1.1,1.2

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22778

Modified Files:
	DTProperties.java 
Log Message:
get Control Panels from data types


Index: DTProperties.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DTProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DTProperties.java	12 May 2004 17:33:28 -0000	1.1
--- DTProperties.java	13 May 2004 00:30:44 -0000	1.2
***************
*** 57,60 ****
--- 57,64 ----
  import java.util.Iterator;
  
+ import java.lang.reflect.Method;
+ 
+ import javax.swing.JPanel;
+ 
  public class DTProperties {
  	
***************
*** 174,176 ****
--- 178,212 ----
  		return (String)h.get(propertyName);
  	}
+ 	
+ 	/**
+ 	 * Get the panels containing the controls needed to adjust all of the properties.
+ 	 * This assumes that the only DataTypes that want to put up control panels
+ 	 * are the ones that have properties to be adjusted.
+ 	 * We do not assume that all properties require a panel.
+ 	 * When this method calls the DataType class to get the panel, the class may return null.
+ 	 */
+ 	public static JPanel[] getControlPanels() {
+ 		ArrayList panelList = new ArrayList();
+ 		
+ 		// get a unique set of names of classes with properties
+ 		Iterator classNames = dataTypes.keySet().iterator();
+ 		
+ 		// run through the list getting the panel from each of the named classes
+ 		while (classNames.hasNext()) {
+ 			String className = (String)classNames.next();
+ 			Class[] parameterTypes = new Class[0];
+ 			try {
+ 				Method panelMethod =
+ 					Class.forName(className).getMethod("getControlPanel", parameterTypes);
+ 					
+ 				JPanel panel = (JPanel)panelMethod.invoke(null, null);
+ 				panelList.add(panel);
+ 			}
+ 			catch (Exception e) {
+ 				// assume that errors here are not fatal and ignore them??
+ 			}
+ 		}
+ 		
+ 		return (JPanel[])panelList.toArray(new JPanel[0]);
+ 	}
  }

[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);
+ 		}
+ 	}
+ 
  
  	/**

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/util ApplicationFiles.java,1.10,1.11

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

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

Modified Files:
	ApplicationFiles.java 
Log Message:
add DTProperties


Index: ApplicationFiles.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/util/ApplicationFiles.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ApplicationFiles.java	20 Apr 2004 19:44:25 -0000	1.10
--- ApplicationFiles.java	12 May 2004 17:34:11 -0000	1.11
***************
*** 135,138 ****
--- 135,147 ----
  	
  	/**
+ 	 * @return file that contains the selections user chose
+ 	 * for DataType-specific properties.
+ 	 */
+ 	public File getDTPropertiesFile()
+ 	{
+ 		return new File(_userSettingsDir + File.separator + "DTproperties.xml");
+ 	}
+ 	
+ 	/**
  	 * @return file that contains the selections user chose for specific columns to use
  	 * in the WHERE clause when editing a cell in a DB table.
***************
*** 142,146 ****
  		return new File(_userSettingsDir + File.separator + "editWhereCols.xml");
  	}
- 	
  
  	/**
--- 151,154 ----

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DTProperties.java,NONE,1.1

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24782

Added Files:
	DTProperties.java 
Log Message:
class to manage DataType-specific properties for save/restore in app


--- NEW FILE: DTProperties.java ---
package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent;
/*
 * Copyright (C) 2001-2003 Colin Bell
 * co...@us...
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
/**
 * @author gwg
 * Object to save, manage and restore DataType-specific properties. 
 * We expect most of these to be settable
 * by the user, but this can be used to save anything that is class-specific
 * in the DataType objects.
 * <P>
 * IMPORTANT: It is the responsibility of the DataType classes to put the
 * property/value pair into this class.  This class does not proactively
 * go out to the DataTypes looking for properties to be saved.
 * <P>
 * This object is created from a file during application startup by the code in
 * net.sourceforge.squirrel_sql.client.Application
 * and saved on application shutdown.
 * The application deals with one view of the data, while internally the
 * Data Type objects work with an entirely different view of the same data.
 * The data is converted from one form to the other during loading and
 * getting of the data when requesed by the Application.
 * <P>
 * The application sees the data as an array of strings.
 * <P>
 * The Data Types see the data as individual String properties.
 * The DataTypes may convert the String to some other form such as
 * a number or a boolean, but that is not the concern of this class.
 * Individual properties are accessed based on the DataType class name
 * and the name of the property.
 * DataTypes are free to create new properties at any time.
 * This class just stores what is passed to it and returns those values
 * when asked.
 * <P>
 * This is named DTProperties rather than DataTypeProperties because that
 * name would indicate that this is another DataType rather than being a 
 * set of data items within the other DataTypes.
 */

import java.util.HashMap;
import java.util.ArrayList;
import java.util.Iterator;

public class DTProperties {
	
	/**
	 * The version of the data suitible for loading/unloading from/to files.
	 * The internal representation is a HashMap containing HashMaps containing strings.
	 * The XMLReader/Writer Beans in fw.xml do not handle the general case of HashMaps,
	 * so rather than trying to handle that there, we just convert the data internally into a form
	 * that those classes can handle, i.e. an array of strings.
	 * Each string consists of the name of the class, a space, the name of
	 * a property, an equals, then the contents of the property, which must
	 * also be a string.
	 * This is used in an instance of this class created during load/unload.
	 */
	private String[] dataArray = new String[0];
	
	/**
	 * The mapping from DataType name to object (also a HashMap)
	 * containing the properties for that DataType.
	 * There is only one copy of this table for all instances of this class.
	 */
	private static HashMap dataTypes = new HashMap();
	
	/**
	 * ctor
	 */
	public DTProperties() {}
	

	/**
	 * get data in form that can be used to output to file.
	 * This is called from an instance of this class.
	 */
	public String[] getDataArray() {
		// first convert internal data into the string array
		Iterator keys = dataTypes.keySet().iterator();

		ArrayList propertyList = new ArrayList();
		
		// get each DataType's info
		while (keys.hasNext()) {
			String tableName = (String)keys.next();
			HashMap h = (HashMap)dataTypes.get(tableName);
			Iterator propertyNames = h.keySet().iterator();
			while (propertyNames.hasNext()) {
				String propertyName = (String)propertyNames.next();
				propertyList.add(
					tableName + " " +
					propertyName + "=" +
					(String)h.get(propertyName));
			}
		}

		dataArray = (String[])propertyList.toArray(dataArray);
		return dataArray;
	}
	
	/**
	 * Data in the external form (array of strings) is passed in and must be converted
	 * to the internal form.
	 * This is called on an instance of this class.
	 * @param inData array of strings in form "DataTypeClass property=value"
	 */
	public void setDataArray(String[] inData) {
		dataTypes = new HashMap();	// make sure we are starting clean
		
		// convert each string into Classname, prop, & value and fill it into the data
		for (int i=0; i< inData.length; i++) {
			int endIndex = inData[i].indexOf(" ");
			String dataTypeName = inData[i].substring(0, endIndex);
			
			int startIndex;
			ArrayList colList = new ArrayList();
			startIndex = endIndex + 1;
			endIndex = inData[i].indexOf("=", startIndex);
			String propertyName = inData[i].substring(startIndex, endIndex);
			String propertyValue = inData[i].substring(endIndex+1);
			
			// if we have seen a property for this DataType before, then the
			// hashmap already exists.  Otherwise, we need to create it now.
			HashMap h = (HashMap)dataTypes.get(dataTypeName);
			if (h == null) {
				h = new HashMap();
				dataTypes.put(dataTypeName, h);
			}
			
			// put the property into the hashmap
			h.put(propertyName, propertyValue);
		}
	}

	/**
	 * add or replace a table-name/hashmap-of-column-names mapping.
	 * If map is null, remove the entry from the tables.
	 */
	public static void put(String dataTypeName, String propertyName,
		String propertyValue) {
		
		// get the hashmap for this type, or create it if this is a new property
		HashMap h = (HashMap)dataTypes.get(dataTypeName);
		if (h == null) {
			h = new HashMap();
			dataTypes.put(dataTypeName, h);
		}
		h.put(propertyName, propertyValue);
	}
	
	/**
	 * get the HashMap of column names for the given table name.
	 * it will be null if the table does not have any limitation on the columns to use.
	 */
	public static String get(String dataTypeName, String propertyName) {
		HashMap h = (HashMap)dataTypes.get(dataTypeName);
		if (h == null)
			return null;
		
		return (String)h.get(propertyName);
	}
}