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

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeTimestamp.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-serv15684

Modified Files:
	DataTypeTimestamp.java 
Log Message:
add full formatting controls


Index: DataTypeTimestamp.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTimestamp.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DataTypeTimestamp.java	17 May 2004 16:41:14 -0000	1.7
--- DataTypeTimestamp.java	21 May 2004 15:46:15 -0000	1.8
***************
*** 19,22 ****
--- 19,27 ----
   */
  import java.awt.event.*;
+ import java.awt.GridBagLayout;
+ import java.awt.GridBagConstraints;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.event.ChangeEvent;
+ import java.awt.Insets;
  
  import java.io.FileInputStream;
***************
*** 29,41 ****
--- 34,54 ----
  import javax.swing.JTextField;
  import javax.swing.JTextArea;
+ import javax.swing.JComboBox;
+ 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;
  import java.sql.Timestamp;
  
+ import java.text.DateFormat;
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
+ import net.sourceforge.squirrel_sql.fw.gui.RightLabel;
  
  
***************
*** 89,92 ****
--- 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.DataTypeTimestamp";
+ 
+ 
+ 	/** Default date format */
+ 	private static int DEFAULT_LOCALE_FORMAT = DateFormat.SHORT;
+ 
+ 	/*
+ 	 * Properties settable by the user
+ 	 */
+ 	 // flag for whether we have already loaded the properties or not
+ 	 private static boolean propertiesAlreadyLoaded = false;
+ 	 
+ 	 // flag for whether to use the default Java format (true)
+ 	 // or the Locale-dependent format (false)
+ 	 private static boolean useJavaDefaultFormat = true;
+ 	 
+ 	 // which locale-dependent format to use; short, medium, long, or full
+ 	 private static int localeFormat = DEFAULT_LOCALE_FORMAT;
+ 	 
+ 	 // Whether to force user to enter dates in exact format or use heuristics to guess it
+ 	 private static boolean lenient = true;
+ 	 
+ 	 // The DateFormat object to use for all locale-dependent formatting.
+ 	 // This is reset each time the user changes the previous settings.
+ 	 private static DateFormat dateFormat =
+ 	 	DateFormat.getDateTimeInstance(localeFormat, localeFormat);
+ 
  
  	/**
***************
*** 97,100 ****
--- 143,186 ----
  		_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
+ 			useJavaDefaultFormat =true;	// set to use the Java default
+ 			String useJavaDefaultFormatString = DTProperties.get(
+ 				thisClassName, "useJavaDefaultFormat");
+ 			if (useJavaDefaultFormatString != null && useJavaDefaultFormatString.equals("false"))
+ 				useJavaDefaultFormat =false;
+ 			
+ 			// get which locale-dependent format to use
+ 			localeFormat =DateFormat.SHORT;	// set to use the Java default
+ 			String localeFormatString = DTProperties.get(
+ 				thisClassName, "localeFormat");
+ 			if (localeFormatString != null)
+ 				localeFormat = Integer.parseInt(localeFormatString);
+ 				
+ 			// use lenient input or force user to enter exact format
+ 			lenient = true;	// set to allow less stringent input
+ 			String lenientString = DTProperties.get(
+ 				thisClassName, "lenient");
+ 			if (lenientString != null && lenientString.equals("false"))
+ 				lenient =false;
+ 		}
  	}
  	
***************
*** 122,126 ****
  	 */
  	public String renderObject(Object value) {
! 		return (String)_renderer.renderObject(value);
  	}
  	
--- 208,217 ----
  	 */
  	public String renderObject(Object value) {
! 		// use the Java default date-to-string
! 		if (useJavaDefaultFormat == true)
! 			return (String)_renderer.renderObject(value);
! 			
! 		// use a date formatter
! 		return (String)_renderer.renderObject(dateFormat.format(value));
  	}
  	
***************
*** 176,182 ****
  
  		// Do the conversion into the object in a safe manner
! 		try {
! 			Object obj = Timestamp.valueOf(value);
! 			return obj;
  		}
  		catch (Exception e) {
--- 267,280 ----
  
  		// Do the conversion into the object in a safe manner
! 		try {		
! 			if (useJavaDefaultFormat) {
! 				Object obj = Timestamp.valueOf(value);
! 				return obj;
! 			}
! 			else {
! 				// use the DateFormat to parse
! 				java.util.Date javaDate = dateFormat.parse(value);
! 				return new Timestamp(javaDate.getTime());
! 			}
  		}
  		catch (Exception e) {
***************
*** 512,514 ****
--- 610,803 ----
  		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 BlobOkJPanel();
+ 	 }
+ 
+ 	// Class that displays the various formats available for dates
+ 	public static class DateFormatTypeCombo extends JComboBox
+ 	{
+ 		public DateFormatTypeCombo()
+ 		{
+ 			addItem("Full (" + 
+ 				DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new java.util.Date()) + ")"  );
+ 			addItem("Long (" + 
+ 				DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(new java.util.Date()) + ")"  );
+ 			addItem("Medium (" + 
+ 				DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(new java.util.Date()) + ")"  );											
+ 			addItem("Short (" + 
+ 				DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(new java.util.Date()) + ")" );
+ 		}
+ 		
+ 		public void setSelectedIndex(int option) {
+ 			if (option == DateFormat.SHORT)
+ 				super.setSelectedIndex(3);
+ 			else if (option == DateFormat.MEDIUM)
+ 				super.setSelectedIndex(2);
+ 			else if (option == DateFormat.LONG)
+ 				super.setSelectedIndex(1);
+ 			else super.setSelectedIndex(0);
+ 		}
+ 		
+ 		public int getValue() {
+ 			if (getSelectedIndex() == 3)
+ 				return DateFormat.SHORT;
+ 			else if (getSelectedIndex() == 2)
+ 				return DateFormat.MEDIUM;
+ 			else if (getSelectedIndex() == 1)
+ 				return DateFormat.LONG;
+ 			else return DateFormat.FULL;
+ 		}
+ 	}	 
+ 	 
+ 	 
+ 	 /**
+ 	  * 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 use Java Default or a Locale-dependent format
+ 		private JCheckBox useJavaDefaultFormatChk = new JCheckBox(
+ 			"Use default format (" + 
+ 			new Timestamp(new java.util.Date().getTime()).toString() + ")");
+ 		
+ 		// label for the date format combo, used to enable/disable text
+ 		private RightLabel dateFormatTypeDropLabel = new RightLabel(" or locale-dependent format:");
+ 				
+ 		// Combo box for read-all/read-part of blob
+ 		private DateFormatTypeCombo dateFormatTypeDrop = new DateFormatTypeCombo();
+ 
+ 		// checkbox for whether to interpret input leniently or not
+ 		private JCheckBox lenientChk = new JCheckBox("allow inexact format on input");
+ 	   
+ 
+ 		public BlobOkJPanel() {
+ 		 	 
+ 			/* set up the controls */
+ 			// checkbox for Java default/non-default format
+ 			useJavaDefaultFormatChk.setSelected(useJavaDefaultFormat);
+ 			useJavaDefaultFormatChk.addChangeListener(new ChangeListener(){
+ 				public void stateChanged(ChangeEvent e) {		
+ 					dateFormatTypeDrop.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 					dateFormatTypeDropLabel.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 					lenientChk.setEnabled( ! useJavaDefaultFormatChk.isSelected());	
+ 				}
+ 			});
+ 		
+ 			// Combo box for read-all/read-part of blob
+ 			dateFormatTypeDrop = new DateFormatTypeCombo();
+ 			dateFormatTypeDrop.setSelectedIndex( localeFormat );
+ 
+ 			// lenient checkbox
+ 			lenientChk.setSelected(lenient);
+ 
+ 	 	 
+ 			// handle cross-connection between fields
+ 			dateFormatTypeDrop.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 			dateFormatTypeDropLabel.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 			lenientChk.setEnabled( ! useJavaDefaultFormatChk.isSelected());	
+ 
+ 			/*
+ 			  * Create the panel and add the GUI items to it
+ 			 */
+ 	 	  
+ 			setLayout(new GridBagLayout());
+ 	 	
+ 			setBorder(BorderFactory.createTitledBorder("Timestamp   (SQL type 93)"));
+ 			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 = GridBagConstraints.REMAINDER;
+ 			add(useJavaDefaultFormatChk, gbc);
+ 
+ 			gbc.gridwidth = 1;
+ 			gbc.gridx = 0;
+ 			++gbc.gridy;
+ 			add(dateFormatTypeDropLabel, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(dateFormatTypeDrop, gbc);
+ 
+ 			gbc.gridx = 0;
+ 			++gbc.gridy;
+ 			add(lenientChk, 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
+ 			useJavaDefaultFormat = useJavaDefaultFormatChk.isSelected();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"useJavaDefaultFormat", Boolean.toString(useJavaDefaultFormat));
+ 			
+ 		
+ 			localeFormat = dateFormatTypeDrop.getValue();
+ 			dateFormat = DateFormat.getDateTimeInstance(localeFormat, localeFormat);	// lenient is set next
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"localeFormat", Integer.toString(localeFormat));	
+ 		
+ 			lenient = lenientChk.isSelected();
+ 			dateFormat.setLenient(lenient);
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"lenient", Boolean.toString(lenient));
+ 		}
+ 	 
+ 	 } // end of inner class	 
+ 	 
  }

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeDate.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-serv15521

Modified Files:
	DataTypeDate.java 
Log Message:
add full formatting controls


Index: DataTypeDate.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DataTypeDate.java	21 May 2004 15:24:03 -0000	1.9
--- DataTypeDate.java	21 May 2004 15:45:52 -0000	1.10
***************
*** 756,762 ****
  			gbc.gridy = 0;
  
! 			gbc.gridwidth = 1;
  			add(useJavaDefaultFormatChk, gbc);
  
  			gbc.gridx = 0;
  			++gbc.gridy;
--- 756,763 ----
  			gbc.gridy = 0;
  
! 			gbc.gridwidth = GridBagConstraints.REMAINDER;
  			add(useJavaDefaultFormatChk, gbc);
  
+ 			gbc.gridwidth = 1;
  			gbc.gridx = 0;
  			++gbc.gridy;

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeTime.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-serv15431

Modified Files:
	DataTypeTime.java 
Log Message:
add full formatting controls


Index: DataTypeTime.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DataTypeTime.java	21 May 2004 14:52:57 -0000	1.8
--- DataTypeTime.java	21 May 2004 15:45:27 -0000	1.9
***************
*** 19,22 ****
--- 19,27 ----
   */
  import java.awt.event.*;
+ import java.awt.GridBagLayout;
+ import java.awt.GridBagConstraints;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.event.ChangeEvent;
+ import java.awt.Insets;
  
  import java.io.FileInputStream;
***************
*** 30,33 ****
--- 35,42 ----
  import javax.swing.JTextArea;
  import javax.swing.SwingUtilities;
+ import javax.swing.JCheckBox;
+ import javax.swing.JComboBox;
+ import javax.swing.BorderFactory;
+ 
  import javax.swing.text.JTextComponent;
  import java.sql.PreparedStatement;
***************
*** 35,41 ****
--- 44,53 ----
  import java.sql.Time;
  
+ import java.text.DateFormat;
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
+ import net.sourceforge.squirrel_sql.fw.gui.RightLabel;
  
  
***************
*** 91,94 ****
--- 103,138 ----
  
  	/**
+ 	 * 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.DataTypeTime";
+ 
+ 
+ 	/** Default date format */
+ 	private static int DEFAULT_LOCALE_FORMAT = DateFormat.SHORT;
+ 
+ 	/*
+ 	 * Properties settable by the user
+ 	 */
+ 	 // flag for whether we have already loaded the properties or not
+ 	 private static boolean propertiesAlreadyLoaded = false;
+ 	 
+ 	 // flag for whether to use the default Java format (true)
+ 	 // or the Locale-dependent format (false)
+ 	 private static boolean useJavaDefaultFormat = true;
+ 	 
+ 	 // which locale-dependent format to use; short, medium, long, or full
+ 	 private static int localeFormat = DEFAULT_LOCALE_FORMAT;
+ 	 
+ 	 // Whether to force user to enter dates in exact format or use heuristics to guess it
+ 	 private static boolean lenient = true;
+ 	 
+ 	 // The DateFormat object to use for all locale-dependent formatting.
+ 	 // This is reset each time the user changes the previous settings.
+ 	 private static DateFormat dateFormat = DateFormat.getTimeInstance(localeFormat);
+ 
+ 	/**
  	 * Constructor - save the data needed by this data type.
  	 */
***************
*** 97,100 ****
--- 141,184 ----
  		_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
+ 			useJavaDefaultFormat =true;	// set to use the Java default
+ 			String useJavaDefaultFormatString = DTProperties.get(
+ 				thisClassName, "useJavaDefaultFormat");
+ 			if (useJavaDefaultFormatString != null && useJavaDefaultFormatString.equals("false"))
+ 				useJavaDefaultFormat =false;
+ 			
+ 			// get which locale-dependent format to use
+ 			localeFormat =DateFormat.SHORT;	// set to use the Java default
+ 			String localeFormatString = DTProperties.get(
+ 				thisClassName, "localeFormat");
+ 			if (localeFormatString != null)
+ 				localeFormat = Integer.parseInt(localeFormatString);
+ 				
+ 			// use lenient input or force user to enter exact format
+ 			lenient = true;	// set to allow less stringent input
+ 			String lenientString = DTProperties.get(
+ 				thisClassName, "lenient");
+ 			if (lenientString != null && lenientString.equals("false"))
+ 				lenient =false;
+ 		}
  	}
  	
***************
*** 122,126 ****
  	 */
  	public String renderObject(Object value) {
! 		return (String)_renderer.renderObject(value);
  	}
  	
--- 206,215 ----
  	 */
  	public String renderObject(Object value) {
! 		// use the Java default date-to-string
! 		if (useJavaDefaultFormat == true)
! 			return (String)_renderer.renderObject(value);
! 			
! 		// use a date formatter
! 		return (String)_renderer.renderObject(dateFormat.format(value));
  	}
  	
***************
*** 177,197 ****
  		// Do the conversion into the object in a safe manner
  		try {
! 			// allow the user to enter just the hour or just hour and minute
! 			// and assume the un-entered values are 0
! 			int firstColon = value.indexOf(":");
! 			if (firstColon == -1) {
! 				// user just entered the hour, so append min & sec
! 				value = value + ":0:0";
! 			}
! 			else {
! 				// user entered hour an min. See if they also entered secs
! 				if (value.indexOf(":", firstColon + 1) == -1) {
! 					// user did not enter seconds
! 					value = value + ":0";
  				}
  			}
! 				
! 			Object obj = Time.valueOf(value);
! 			return obj;
  		}
  		catch (Exception e) {
--- 266,292 ----
  		// Do the conversion into the object in a safe manner
  		try {
! 			if (useJavaDefaultFormat) {
! 				// allow the user to enter just the hour or just hour and minute
! 				// and assume the un-entered values are 0
! 				int firstColon = value.indexOf(":");
! 				if (firstColon == -1) {
! 					// user just entered the hour, so append min & sec
! 					value = value + ":0:0";
  				}
+ 				else {
+ 					// user entered hour an min. See if they also entered secs
+ 					if (value.indexOf(":", firstColon + 1) == -1) {
+ 						// user did not enter seconds
+ 						value = value + ":0";
+ 					}
+ 				}
+ 				Object obj = Time.valueOf(value);
+ 				return obj;
  			}
! 			else {
! 				// use the DateFormat to parse
! 				java.util.Date javaDate = dateFormat.parse(value);
! 				return new Time(javaDate.getTime());
! 			}			
  		}
  		catch (Exception e) {
***************
*** 527,529 ****
--- 622,814 ----
  		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 BlobOkJPanel();
+ 	 }
+ 
+ 	// Class that displays the various formats available for dates
+ 	public static class DateFormatTypeCombo extends JComboBox
+ 	{
+ 		public DateFormatTypeCombo()
+ 		{
+ 			addItem("Full (" + 
+ 				DateFormat.getTimeInstance(DateFormat.FULL).format(new java.util.Date()) + ")"  );
+ 			addItem("Long (" + 
+ 				DateFormat.getTimeInstance(DateFormat.LONG).format(new java.util.Date()) + ")"  );
+ 			addItem("Medium (" + 
+ 				DateFormat.getTimeInstance(DateFormat.MEDIUM).format(new java.util.Date()) + ")"  );											
+ 			addItem("Short (" + 
+ 				DateFormat.getTimeInstance(DateFormat.SHORT).format(new java.util.Date()) + ")" );
+ 		}
+ 		
+ 		public void setSelectedIndex(int option) {
+ 			if (option == DateFormat.SHORT)
+ 				super.setSelectedIndex(3);
+ 			else if (option == DateFormat.MEDIUM)
+ 				super.setSelectedIndex(2);
+ 			else if (option == DateFormat.LONG)
+ 				super.setSelectedIndex(1);
+ 			else super.setSelectedIndex(0);
+ 		}
+ 		
+ 		public int getValue() {
+ 			if (getSelectedIndex() == 3)
+ 				return DateFormat.SHORT;
+ 			else if (getSelectedIndex() == 2)
+ 				return DateFormat.MEDIUM;
+ 			else if (getSelectedIndex() == 1)
+ 				return DateFormat.LONG;
+ 			else return DateFormat.FULL;
+ 		}
+ 	}	 
+ 	 
+ 	 
+ 	 /**
+ 	  * 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 use Java Default or a Locale-dependent format
+ 		private JCheckBox useJavaDefaultFormatChk = new JCheckBox(
+ 			"Use default format (" + 
+ 			new Time(new java.util.Date().getTime()).toString() + ")");
+ 		
+ 		// label for the date format combo, used to enable/disable text
+ 		private RightLabel dateFormatTypeDropLabel = new RightLabel(" or locale-dependent format:");
+ 				
+ 		// Combo box for read-all/read-part of blob
+ 		private DateFormatTypeCombo dateFormatTypeDrop = new DateFormatTypeCombo();
+ 
+ 		// checkbox for whether to interpret input leniently or not
+ 		private JCheckBox lenientChk = new JCheckBox("allow inexact format on input");
+ 	   
+ 
+ 		public BlobOkJPanel() {
+ 		 	 
+ 			/* set up the controls */
+ 			// checkbox for Java default/non-default format
+ 			useJavaDefaultFormatChk.setSelected(useJavaDefaultFormat);
+ 			useJavaDefaultFormatChk.addChangeListener(new ChangeListener(){
+ 				public void stateChanged(ChangeEvent e) {		
+ 					dateFormatTypeDrop.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 					dateFormatTypeDropLabel.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 					lenientChk.setEnabled( ! useJavaDefaultFormatChk.isSelected());	
+ 				}
+ 			});
+ 		
+ 			// Combo box for read-all/read-part of blob
+ 			dateFormatTypeDrop = new DateFormatTypeCombo();
+ 			dateFormatTypeDrop.setSelectedIndex( localeFormat );
+ 
+ 			// lenient checkbox
+ 			lenientChk.setSelected(lenient);
+ 
+ 	 	 
+ 			// handle cross-connection between fields
+ 			dateFormatTypeDrop.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 			dateFormatTypeDropLabel.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 			lenientChk.setEnabled( ! useJavaDefaultFormatChk.isSelected());	
+ 
+ 			/*
+ 			  * Create the panel and add the GUI items to it
+ 			 */
+ 	 	  
+ 			setLayout(new GridBagLayout());
+ 	 	
+ 			setBorder(BorderFactory.createTitledBorder("Time   (SQL type 92)"));
+ 			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 = GridBagConstraints.REMAINDER;
+ 			add(useJavaDefaultFormatChk, gbc);
+ 
+ 			gbc.gridwidth = 1;
+ 			gbc.gridx = 0;
+ 			++gbc.gridy;
+ 			add(dateFormatTypeDropLabel, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(dateFormatTypeDrop, gbc);
+ 
+ 			gbc.gridx = 0;
+ 			++gbc.gridy;
+ 			add(lenientChk, 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
+ 			useJavaDefaultFormat = useJavaDefaultFormatChk.isSelected();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"useJavaDefaultFormat", Boolean.toString(useJavaDefaultFormat));
+ 			
+ 		
+ 			localeFormat = dateFormatTypeDrop.getValue();
+ 			dateFormat = DateFormat.getTimeInstance(localeFormat);	// lenient is set next
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"localeFormat", Integer.toString(localeFormat));	
+ 		
+ 			lenient = lenientChk.isSelected();
+ 			dateFormat.setLenient(lenient);
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"lenient", Boolean.toString(lenient));
+ 		}
+ 	 
+ 	 } // end of inner class
+ 
  }

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeDate.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-serv11107

Modified Files:
	DataTypeDate.java 
Log Message:
use correct function for getDateInstance


Index: DataTypeDate.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DataTypeDate.java	21 May 2004 14:53:43 -0000	1.8
--- DataTypeDate.java	21 May 2004 15:24:03 -0000	1.9
***************
*** 132,136 ****
  	 // The DateFormat object to use for all locale-dependent formatting.
  	 // This is reset each time the user changes the previous settings.
! 	 private static DateFormat dateFormat = DateFormat.getInstance();
  	
  	
--- 132,136 ----
  	 // The DateFormat object to use for all locale-dependent formatting.
  	 // This is reset each time the user changes the previous settings.
! 	 private static DateFormat dateFormat = DateFormat.getDateInstance(localeFormat);
  	
  	

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

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

Modified Files:
	CellComponentFactory.java 
Log Message:
add Date type for properties


Index: CellComponentFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** CellComponentFactory.java	19 May 2004 14:31:26 -0000	1.27
--- CellComponentFactory.java	21 May 2004 14:54:13 -0000	1.28
***************
*** 688,691 ****
--- 688,692 ----
  			"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeOther",
  			"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeUnknown",
+ 			"net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeDate",
  			 };
  		

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeDate.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-serv5013

Modified Files:
	DataTypeDate.java 
Log Message:
add formatting options


Index: DataTypeDate.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DataTypeDate.java	17 May 2004 16:37:48 -0000	1.7
--- DataTypeDate.java	21 May 2004 14:53:43 -0000	1.8
***************
*** 19,22 ****
--- 19,27 ----
   */
  import java.awt.event.*;
+ import java.awt.GridBagLayout;
+ import java.awt.GridBagConstraints;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.event.ChangeEvent;
+ import java.awt.Insets;
  
  import java.io.FileInputStream;
***************
*** 29,41 ****
--- 34,55 ----
  import javax.swing.JTextField;
  import javax.swing.JTextArea;
+ import javax.swing.JCheckBox;
+ import javax.swing.JComboBox;
  import javax.swing.SwingUtilities;
  import javax.swing.text.JTextComponent;
+ import javax.swing.BorderFactory;
+ 
+ 
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
  import java.sql.Date;
  
+ import java.text.DateFormat;
+ 
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+ import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
+ import net.sourceforge.squirrel_sql.fw.gui.RightLabel;
  
  /**
***************
*** 88,91 ****
--- 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.DataTypeDate";
+ 
+ 
+ 	/** Default date format */
+ 	private static int DEFAULT_LOCALE_FORMAT = DateFormat.SHORT;
+ 
+ 	/*
+ 	 * Properties settable by the user
+ 	 */
+ 	 // flag for whether we have already loaded the properties or not
+ 	 private static boolean propertiesAlreadyLoaded = false;
+ 	 
+ 	 // flag for whether to use the default Java format (true)
+ 	 // or the Locale-dependent format (false)
+ 	 private static boolean useJavaDefaultFormat = true;
+ 	 
+ 	 // which locale-dependent format to use; short, medium, long, or full
+ 	 private static int localeFormat = DEFAULT_LOCALE_FORMAT;
+ 	 
+ 	 // Whether to force user to enter dates in exact format or use heuristics to guess it
+ 	 private static boolean lenient = true;
+ 	 
+ 	 // The DateFormat object to use for all locale-dependent formatting.
+ 	 // This is reset each time the user changes the previous settings.
+ 	 private static DateFormat dateFormat = DateFormat.getInstance();
+ 	
+ 	
  
  	/**
***************
*** 96,99 ****
--- 143,186 ----
  		_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
+ 			useJavaDefaultFormat =true;	// set to use the Java default
+ 			String useJavaDefaultFormatString = DTProperties.get(
+ 				thisClassName, "useJavaDefaultFormat");
+ 			if (useJavaDefaultFormatString != null && useJavaDefaultFormatString.equals("false"))
+ 				useJavaDefaultFormat =false;
+ 			
+ 			// get which locale-dependent format to use
+ 			localeFormat =DateFormat.SHORT;	// set to use the Java default
+ 			String localeFormatString = DTProperties.get(
+ 				thisClassName, "localeFormat");
+ 			if (localeFormatString != null)
+ 				localeFormat = Integer.parseInt(localeFormatString);
+ 				
+ 			// use lenient input or force user to enter exact format
+ 			lenient = true;	// set to allow less stringent input
+ 			String lenientString = DTProperties.get(
+ 				thisClassName, "lenient");
+ 			if (lenientString != null && lenientString.equals("false"))
+ 				lenient =false;
+ 		}
  	}
  	
***************
*** 121,125 ****
  	 */
  	public String renderObject(Object value) {
! 		return (String)_renderer.renderObject(value);
  	}
  	
--- 208,217 ----
  	 */
  	public String renderObject(Object value) {
! 		// use the Java default date-to-string
! 		if (useJavaDefaultFormat == true)
! 			return (String)_renderer.renderObject(value);
! 			
! 		// use a date formatter
! 		return (String)_renderer.renderObject(dateFormat.format(value));
  	}
  	
***************
*** 176,181 ****
  		// Do the conversion into the object in a safe manner
  		try {
! 			Object obj = Date.valueOf(value);
! 			return obj;
  		}
  		catch (Exception e) {
--- 268,281 ----
  		// Do the conversion into the object in a safe manner
  		try {
! 			if (useJavaDefaultFormat) {
! 				Object obj = Date.valueOf(value);
! 				return obj;
! 			}
! 			else {
! 				// use the DateFormat to parse
! 				java.util.Date javaDate = dateFormat.parse(value);
! 				java.sql.Date sqlDate = new java.sql.Date(javaDate.getTime());
! 				return sqlDate;
! 			}
  		}
  		catch (Exception e) {
***************
*** 511,513 ****
--- 611,801 ----
  		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 BlobOkJPanel();
+ 	 }
+ 
+ 	// Class that displays the various formats available for dates
+ 	public static class DateFormatTypeCombo extends JComboBox
+ 	{
+ 		public DateFormatTypeCombo()
+ 		{
+ 			addItem("Full (" + 
+ 				DateFormat.getDateInstance(DateFormat.FULL).format(new java.util.Date()) + ")"  );
+ 			addItem("Long (" + 
+ 				DateFormat.getDateInstance(DateFormat.LONG).format(new java.util.Date()) + ")"  );
+ 			addItem("Medium (" + 
+ 				DateFormat.getDateInstance(DateFormat.MEDIUM).format(new java.util.Date()) + ")"  );											
+ 			addItem("Short (" + 
+ 				DateFormat.getDateInstance(DateFormat.SHORT).format(new java.util.Date()) + ")" );
+ 		}
+ 		
+ 		public void setSelectedIndex(int option) {
+ 			if (option == DateFormat.SHORT)
+ 				super.setSelectedIndex(3);
+ 			else if (option == DateFormat.MEDIUM)
+ 				super.setSelectedIndex(2);
+ 			else if (option == DateFormat.LONG)
+ 				super.setSelectedIndex(1);
+ 			else super.setSelectedIndex(0);
+ 		}
+ 		
+ 		public int getValue() {
+ 			if (getSelectedIndex() == 3)
+ 				return DateFormat.SHORT;
+ 			else if (getSelectedIndex() == 2)
+ 				return DateFormat.MEDIUM;
+ 			else if (getSelectedIndex() == 1)
+ 				return DateFormat.LONG;
+ 			else return DateFormat.FULL;
+ 		}
+ 	}	 
+ 	 
+ 	 
+ 	 /**
+ 	  * 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 use Java Default or a Locale-dependent format
+ 		private JCheckBox useJavaDefaultFormatChk = new JCheckBox(
+ 			"Use default format (" + 
+ 			new java.sql.Date(new java.util.Date().getTime()).toString() + ")");
+ 		
+ 		// label for the date format combo, used to enable/disable text
+ 		private RightLabel dateFormatTypeDropLabel = new RightLabel(" or locale-dependent format:");
+ 				
+ 		// Combo box for read-all/read-part of blob
+ 		private DateFormatTypeCombo dateFormatTypeDrop = new DateFormatTypeCombo();
+ 
+ 		// checkbox for whether to interpret input leniently or not
+ 		private JCheckBox lenientChk = new JCheckBox("allow inexact format on input");
+ 	   
+ 
+ 		public BlobOkJPanel() {
+ 		 	 
+ 			/* set up the controls */
+ 			// checkbox for Java default/non-default format
+ 			useJavaDefaultFormatChk.setSelected(useJavaDefaultFormat);
+ 			useJavaDefaultFormatChk.addChangeListener(new ChangeListener(){
+ 				public void stateChanged(ChangeEvent e) {		
+ 					dateFormatTypeDrop.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 					dateFormatTypeDropLabel.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 					lenientChk.setEnabled( ! useJavaDefaultFormatChk.isSelected());	
+ 				}
+ 			});
+ 		
+ 			// Combo box for read-all/read-part of blob
+ 			dateFormatTypeDrop = new DateFormatTypeCombo();
+ 			dateFormatTypeDrop.setSelectedIndex( localeFormat );
+ 
+ 			// lenient checkbox
+ 			lenientChk.setSelected(lenient);
+ 
+ 	 	 
+ 			// handle cross-connection between fields
+ 			dateFormatTypeDrop.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 			dateFormatTypeDropLabel.setEnabled( ! useJavaDefaultFormatChk.isSelected());
+ 			lenientChk.setEnabled( ! useJavaDefaultFormatChk.isSelected());	
+ 
+ 			/*
+ 			  * Create the panel and add the GUI items to it
+ 			 */
+ 	 	  
+ 			setLayout(new GridBagLayout());
+ 	 	
+ 			setBorder(BorderFactory.createTitledBorder("Date   (SQL type 91)"));
+ 			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(useJavaDefaultFormatChk, gbc);
+ 
+ 			gbc.gridx = 0;
+ 			++gbc.gridy;
+ 			add(dateFormatTypeDropLabel, gbc);
+ 
+ 			++gbc.gridx;
+ 			add(dateFormatTypeDrop, gbc);
+ 
+ 			gbc.gridx = 0;
+ 			++gbc.gridy;
+ 			add(lenientChk, 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
+ 			useJavaDefaultFormat = useJavaDefaultFormatChk.isSelected();
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"useJavaDefaultFormat", Boolean.toString(useJavaDefaultFormat));
+ 			
+ 		
+ 			localeFormat = dateFormatTypeDrop.getValue();
+ 			dateFormat = DateFormat.getDateInstance(localeFormat);	// lenient is set next
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"localeFormat", Integer.toString(localeFormat));	
+ 		
+ 			lenient = lenientChk.isSelected();
+ 			dateFormat.setLenient(lenient);
+ 			DTProperties.put(
+ 				thisClassName,
+ 				"lenient", Boolean.toString(lenient));
+ 		}
+ 	 
+ 	 } // end of inner class
  }

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeTime.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-serv4793

Modified Files:
	DataTypeTime.java 
Log Message:
more flexible input


Index: DataTypeTime.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DataTypeTime.java	17 May 2004 16:41:01 -0000	1.7
--- DataTypeTime.java	21 May 2004 14:52:57 -0000	1.8
***************
*** 177,180 ****
--- 177,195 ----
  		// Do the conversion into the object in a safe manner
  		try {
+ 			// allow the user to enter just the hour or just hour and minute
+ 			// and assume the un-entered values are 0
+ 			int firstColon = value.indexOf(":");
+ 			if (firstColon == -1) {
+ 				// user just entered the hour, so append min & sec
+ 				value = value + ":0:0";
+ 			}
+ 			else {
+ 				// user entered hour an min. See if they also entered secs
+ 				if (value.indexOf(":", firstColon + 1) == -1) {
+ 					// user did not enter seconds
+ 					value = value + ":0";
+ 				}
+ 			}
+ 				
  			Object obj = Time.valueOf(value);
  			return obj;

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

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

Modified Files:
	FormatSessionPropertiesPanel.java 
Log Message:
add JScrollPane to format tab


Index: FormatSessionPropertiesPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/FormatSessionPropertiesPanel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FormatSessionPropertiesPanel.java	19 May 2004 14:59:00 -0000	1.7
--- FormatSessionPropertiesPanel.java	21 May 2004 13:53:19 -0000	1.8
***************
*** 22,29 ****
--- 22,31 ----
  import java.awt.GridBagLayout;
  import java.awt.Insets;
+ import java.awt.Dimension;
  
  import javax.swing.JLabel;
  import javax.swing.JPanel;
  import javax.swing.SwingConstants;
+ import javax.swing.JScrollPane;
  
  import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
***************
*** 138,141 ****
--- 140,144 ----
  		private void createGUI(IApplication app)
  		{
+ 
  			setLayout(new GridBagLayout());
  			final GridBagConstraints gbc = new GridBagConstraints();
***************
*** 146,150 ****
  			gbc.gridx = 0;
  			gbc.gridy = 0;
! 			add(createDataTypesPanel(), gbc);
  		}
  
--- 149,157 ----
  			gbc.gridx = 0;
  			gbc.gridy = 0;
! 
! 			JScrollPane sp = new JScrollPane(createDataTypesPanel());
! 			sp.setPreferredSize(new Dimension(550, 450));
! 			add(sp, gbc);
! 
  		}
  

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties SessionPropertiesBeanInfo.java,1.9,1.10

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

Modified Files:
	SessionPropertiesBeanInfo.java 
Log Message:
cleanup LOB use


Index: SessionPropertiesBeanInfo.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SessionPropertiesBeanInfo.java	19 May 2004 15:31:08 -0000	1.9
--- SessionPropertiesBeanInfo.java	19 May 2004 15:40:39 -0000	1.10
***************
*** 66,71 ****
  			s_dscrs[11] = new PropertyDescriptor(IPropNames.SQL_RESULTS_OUTPUT_CLASS_NAME,
  									CLAZZ, "getSQLResultsOutputClassName", "setSQLResultsOutputClassName");
- //??			s_dscrs[12] = new PropertyDescriptor(IPropNames.LARGE_RESULT_SET_OBJECT_INFO,
- //??									CLAZZ, "getLargeResultSetObjectInfo", "setLargeResultSetObjectInfo");
  			s_dscrs[12] = new PropertyDescriptor(IPropNames.SQL_START_OF_LINE_COMMENT,
  									CLAZZ, "getStartOfLineComment", "setStartOfLineComment");
--- 66,69 ----

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties SessionPropertiesBeanInfo.java,1.8,1.9

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

Modified Files:
	SessionPropertiesBeanInfo.java 
Log Message:
cleanup LOB use


Index: SessionPropertiesBeanInfo.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesBeanInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SessionPropertiesBeanInfo.java	1 Dec 2003 12:08:38 -0000	1.8
--- SessionPropertiesBeanInfo.java	19 May 2004 15:31:08 -0000	1.9
***************
*** 41,45 ****
  		if (s_dscrs == null)
  		{
! 			s_dscrs = new PropertyDescriptor[26];
  			s_dscrs[0] = new PropertyDescriptor(IPropNames.AUTO_COMMIT,
  									CLAZZ, "getAutoCommit", "setAutoCommit");
--- 41,45 ----
  		if (s_dscrs == null)
  		{
! 			s_dscrs = new PropertyDescriptor[25];
  			s_dscrs[0] = new PropertyDescriptor(IPropNames.AUTO_COMMIT,
  									CLAZZ, "getAutoCommit", "setAutoCommit");
***************
*** 66,96 ****
  			s_dscrs[11] = new PropertyDescriptor(IPropNames.SQL_RESULTS_OUTPUT_CLASS_NAME,
  									CLAZZ, "getSQLResultsOutputClassName", "setSQLResultsOutputClassName");
! 			s_dscrs[12] = new PropertyDescriptor(IPropNames.LARGE_RESULT_SET_OBJECT_INFO,
! 									CLAZZ, "getLargeResultSetObjectInfo", "setLargeResultSetObjectInfo");
! 			s_dscrs[13] = new PropertyDescriptor(IPropNames.SQL_START_OF_LINE_COMMENT,
  									CLAZZ, "getStartOfLineComment", "setStartOfLineComment");
! 			s_dscrs[14] = new PropertyDescriptor(IPropNames.LIMIT_SQL_ENTRY_HISTORY_SIZE,
  									CLAZZ, "getLimitSQLEntryHistorySize", "setLimitSQLEntryHistorySize");
! 			s_dscrs[15] = new PropertyDescriptor(IPropNames.SQL_ENTRY_HISTORY_SIZE,
  									CLAZZ, "getSQLEntryHistorySize", "setSQLEntryHistorySize");
! 			s_dscrs[16] = new PropertyDescriptor(IPropNames.SQL_SHARE_HISTORY,
  									CLAZZ, "getSQLShareHistory", "setSQLShareHistory");
! 			s_dscrs[17] = new PropertyDescriptor(IPropNames.MAIN_TAB_PLACEMENT,
  									CLAZZ, "getMainTabPlacement", "setMainTabPlacement");
! 			s_dscrs[18] = new PropertyDescriptor(IPropNames.OBJECT_TAB_PLACEMENT,
  									CLAZZ, "getObjectTabPlacement", "setObjectTabPlacement");
! 			s_dscrs[19] = new PropertyDescriptor(IPropNames.SQL_EXECUTION_TAB_PLACEMENT,
  									CLAZZ, "getSQLExecutionTabPlacement", "setSQLExecutionTabPlacement");
! 			s_dscrs[20] = new PropertyDescriptor(IPropNames.SQL_RESULTS_TAB_PLACEMENT,
  									CLAZZ, "getSQLResultsTabPlacement", "setSQLResultsTabPlacement");
! 			s_dscrs[21] = new PropertyDescriptor(IPropNames.TABLE_CONTENTS_OUTPUT_CLASS_NAME,
  									CLAZZ, "getTableContentsOutputClassName", "setTableContentsOutputClassName");
! 			s_dscrs[22] = new PropertyDescriptor(IPropNames.ABORT_ON_ERROR,
  									CLAZZ, "getAbortOnError", "setAbortOnError");
! 			s_dscrs[23] = new PropertyDescriptor(IPropNames.SCHEMA_PREFIX_LIST,
  									CLAZZ, "getSchemaPrefixList", "setSchemaPrefixList");
! 			s_dscrs[24] = new PropertyDescriptor(IPropNames.LOAD_SCHEMAS_CATALOGS,
  									CLAZZ, "getLoadSchemasCatalogs", "setLoadSchemasCatalogs");		
! 			s_dscrs[25] = new PropertyDescriptor(IPropNames.SHOW_RESULTS_META_DATA,
  									CLAZZ, "getShowResultsMetaData", "setShowResultsMetaData");		
  		}
--- 66,96 ----
  			s_dscrs[11] = new PropertyDescriptor(IPropNames.SQL_RESULTS_OUTPUT_CLASS_NAME,
  									CLAZZ, "getSQLResultsOutputClassName", "setSQLResultsOutputClassName");
! //??			s_dscrs[12] = new PropertyDescriptor(IPropNames.LARGE_RESULT_SET_OBJECT_INFO,
! //??									CLAZZ, "getLargeResultSetObjectInfo", "setLargeResultSetObjectInfo");
! 			s_dscrs[12] = new PropertyDescriptor(IPropNames.SQL_START_OF_LINE_COMMENT,
  									CLAZZ, "getStartOfLineComment", "setStartOfLineComment");
! 			s_dscrs[13] = new PropertyDescriptor(IPropNames.LIMIT_SQL_ENTRY_HISTORY_SIZE,
  									CLAZZ, "getLimitSQLEntryHistorySize", "setLimitSQLEntryHistorySize");
! 			s_dscrs[14] = new PropertyDescriptor(IPropNames.SQL_ENTRY_HISTORY_SIZE,
  									CLAZZ, "getSQLEntryHistorySize", "setSQLEntryHistorySize");
! 			s_dscrs[15] = new PropertyDescriptor(IPropNames.SQL_SHARE_HISTORY,
  									CLAZZ, "getSQLShareHistory", "setSQLShareHistory");
! 			s_dscrs[16] = new PropertyDescriptor(IPropNames.MAIN_TAB_PLACEMENT,
  									CLAZZ, "getMainTabPlacement", "setMainTabPlacement");
! 			s_dscrs[17] = new PropertyDescriptor(IPropNames.OBJECT_TAB_PLACEMENT,
  									CLAZZ, "getObjectTabPlacement", "setObjectTabPlacement");
! 			s_dscrs[18] = new PropertyDescriptor(IPropNames.SQL_EXECUTION_TAB_PLACEMENT,
  									CLAZZ, "getSQLExecutionTabPlacement", "setSQLExecutionTabPlacement");
! 			s_dscrs[19] = new PropertyDescriptor(IPropNames.SQL_RESULTS_TAB_PLACEMENT,
  									CLAZZ, "getSQLResultsTabPlacement", "setSQLResultsTabPlacement");
! 			s_dscrs[20] = new PropertyDescriptor(IPropNames.TABLE_CONTENTS_OUTPUT_CLASS_NAME,
  									CLAZZ, "getTableContentsOutputClassName", "setTableContentsOutputClassName");
! 			s_dscrs[21] = new PropertyDescriptor(IPropNames.ABORT_ON_ERROR,
  									CLAZZ, "getAbortOnError", "setAbortOnError");
! 			s_dscrs[22] = new PropertyDescriptor(IPropNames.SCHEMA_PREFIX_LIST,
  									CLAZZ, "getSchemaPrefixList", "setSchemaPrefixList");
! 			s_dscrs[23] = new PropertyDescriptor(IPropNames.LOAD_SCHEMAS_CATALOGS,
  									CLAZZ, "getLoadSchemasCatalogs", "setLoadSchemasCatalogs");		
! 			s_dscrs[24] = new PropertyDescriptor(IPropNames.SHOW_RESULTS_META_DATA,
  									CLAZZ, "getShowResultsMetaData", "setShowResultsMetaData");		
  		}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql ResultSetColumnReader.java,1.4,1.5

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

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

Modified Files:
	ResultSetColumnReader.java 
Log Message:
cleanup LOB use


Index: ResultSetColumnReader.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetColumnReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ResultSetColumnReader.java	6 Oct 2003 01:15:36 -0000	1.4
--- ResultSetColumnReader.java	19 May 2004 15:25:29 -0000	1.5
***************
*** 28,32 ****
  import java.sql.Types;
  
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
--- 28,31 ----
***************
*** 44,49 ****
  	private final ResultSet _rs;
  
- 	/** Describes how to handle "blob" type data. */
- 	private final LargeResultSetObjectInfo _largeObjInfo;
  
  	/** <TT>true</TT> if the last column read had a value of SQL NULL. */
--- 43,46 ----
***************
*** 55,73 ****
  	public ResultSetColumnReader(ResultSet rs) throws SQLException
  	{
! 		this(rs, null, null);
! 	}
! 
! 	public ResultSetColumnReader(ResultSet rs, LargeResultSetObjectInfo largeObjInfo)
! 		throws SQLException
! 	{
! 		this(rs, largeObjInfo, null);
  	}
  
- 	public ResultSetColumnReader(ResultSet rs, int[] columnIndices) throws SQLException
- 	{
- 		this(rs, null, columnIndices);
- 	}
  
! 	public ResultSetColumnReader(ResultSet rs, LargeResultSetObjectInfo largeObjInfo,
  							int[] columnIndices) throws SQLException
  	{
--- 52,60 ----
  	public ResultSetColumnReader(ResultSet rs) throws SQLException
  	{
! 		this(rs,  null);
  	}
  
  
! 	public ResultSetColumnReader(ResultSet rs,
  							int[] columnIndices) throws SQLException
  	{
***************
*** 80,84 ****
  		_rs = rs;
  		_rsmd = rs.getMetaData();
- 		_largeObjInfo = largeObjInfo != null ? largeObjInfo : new LargeResultSetObjectInfo();
  	}
  
--- 67,70 ----

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties SessionProperties.java,1.10,1.11

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

Modified Files:
	SessionProperties.java 
Log Message:
cleanup LOB use


Index: SessionProperties.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SessionProperties.java	13 Dec 2003 10:53:07 -0000	1.10
--- SessionProperties.java	19 May 2004 15:24:02 -0000	1.11
***************
*** 27,31 ****
  import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTextPanel;
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  import net.sourceforge.squirrel_sql.fw.gui.FontInfo;
  import net.sourceforge.squirrel_sql.fw.util.PropertyChangeReporter;
--- 27,30 ----
***************
*** 168,172 ****
  	private int _objectTabPlacement = SwingConstants.TOP;
  
- 	private LargeResultSetObjectInfo _largeObjectInfo = new LargeResultSetObjectInfo();
  
  	/**
--- 167,170 ----
***************
*** 208,215 ****
  				props.setFontInfo((FontInfo)_fi.clone());
  			}
! 			if (_largeObjectInfo != null)
! 			{
! 				props.setLargeResultSetObjectInfo((LargeResultSetObjectInfo)_largeObjectInfo.clone());
! 			}
  
  			return props;
--- 206,210 ----
  				props.setFontInfo((FontInfo)_fi.clone());
  			}
! 
  
  			return props;
***************
*** 594,610 ****
  	}
  
- 	public LargeResultSetObjectInfo getLargeResultSetObjectInfo()
- 	{
- 		return _largeObjectInfo;
- 	}
- 
- 	public void setLargeResultSetObjectInfo(LargeResultSetObjectInfo data)
- 	{
- 		final LargeResultSetObjectInfo oldValue = _largeObjectInfo;
- 		_largeObjectInfo = data;
- 		getPropertyChangeReporter().firePropertyChange(
- 			IPropertyNames.LARGE_RESULT_SET_OBJECT_INFO,
- 			oldValue, _largeObjectInfo);
- 	}
  
  	public boolean getLimitSQLEntryHistorySize()
--- 589,592 ----

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table ImportedKeysTab.java,1.6,1.7

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

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

Modified Files:
	ImportedKeysTab.java 
Log Message:
cleanup LOB use


Index: ImportedKeysTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ImportedKeysTab.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ImportedKeysTab.java	19 May 2004 14:23:14 -0000	1.6
--- ImportedKeysTab.java	19 May 2004 15:23:08 -0000	1.7
***************
*** 79,83 ****
  				final ResultSetDataSet rsds = new ResultSetDataSet();
   				rsds.setResultSet(rs, null, true);
- // 				rsds.setResultSet(rs, getSession().getProperties().getLargeResultSetObjectInfo(), new int[] { 1,2,3,4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, true);
  				return rsds;
  			}
--- 79,82 ----

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table ExportedKeysTab.java,1.5,1.6

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

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

Modified Files:
	ExportedKeysTab.java 
Log Message:
cleanup LOB use


Index: ExportedKeysTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ExportedKeysTab.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExportedKeysTab.java	19 May 2004 14:22:48 -0000	1.5
--- ExportedKeysTab.java	19 May 2004 15:22:55 -0000	1.6
***************
*** 77,81 ****
  				final ResultSetDataSet rsds = new ResultSetDataSet();
  				rsds.setResultSet(rs, null, true);
- // 				rsds.setResultSet(rs, getSession().getProperties().getLargeResultSetObjectInfo(), new int[] { 1,2,3,4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, true);
  				return rsds;
  			}
--- 77,80 ----

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeClob.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-serv29087

Modified Files:
	DataTypeClob.java 
Log Message:
cleanup LOB use


Index: DataTypeClob.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeClob.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DataTypeClob.java	17 May 2004 16:36:26 -0000	1.9
--- DataTypeClob.java	19 May 2004 15:22:01 -0000	1.10
***************
*** 222,226 ****
  	 * It is called only when the user enters the cell, either to examine
  	 * or to edit the data.
! 	 * The user may have set the LargeResultSetObjectInfo parameters to
  	 * minimize the data read during the initial table load (to speed it up),
  	 * but when they enter this cell we would like to show them the entire
--- 222,226 ----
  	 * It is called only when the user enters the cell, either to examine
  	 * or to edit the data.
! 	 * The user may have set the DataType properties to
  	 * minimize the data read during the initial table load (to speed it up),
  	 * but when they enter this cell we would like to show them the entire

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

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

Modified Files:
	DataTypeBlob.java 
Log Message:
cleanup LOB use


Index: DataTypeBlob.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBlob.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DataTypeBlob.java	17 May 2004 16:34:17 -0000	1.4
--- DataTypeBlob.java	19 May 2004 15:21:44 -0000	1.5
***************
*** 229,233 ****
  	 * It is called only when the user enters the cell, either to examine
  	 * or to edit the data.
! 	 * The user may have set the LargeResultSetObjectInfo parameters to
  	 * minimize the data read during the initial table load (to speed it up),
  	 * but when they enter this cell we would like to show them the entire
--- 229,233 ----
  	 * It is called only when the user enters the cell, either to examine
  	 * or to edit the data.
! 	 * The user may have set the DataType properties to
  	 * minimize the data read during the initial table load (to speed it up),
  	 * but when they enter this cell we would like to show them the entire

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

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

Modified Files:
	FormatSessionPropertiesPanel.java 
Log Message:
remove unneeded code


Index: FormatSessionPropertiesPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/FormatSessionPropertiesPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FormatSessionPropertiesPanel.java	17 May 2004 15:32:09 -0000	1.6
--- FormatSessionPropertiesPanel.java	19 May 2004 14:59:00 -0000	1.7
***************
*** 22,40 ****
  import java.awt.GridBagLayout;
  import java.awt.Insets;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
  
- import javax.swing.BorderFactory;
- import javax.swing.JCheckBox;
- import javax.swing.JComboBox;
  import javax.swing.JLabel;
  import javax.swing.JPanel;
  import javax.swing.SwingConstants;
- import javax.swing.event.ChangeEvent;
- import javax.swing.event.ChangeListener;
- import javax.swing.JTextArea;
  
- 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;
--- 22,30 ----
***************
*** 44,50 ****
  import net.sourceforge.squirrel_sql.client.session.ISession;
  /**
!  * This panel allows the user to tailor formatting settings for a session.
   *
   * @author <A HREF="mailto:co...@us...">Colin Bell</A>
   */
  public class FormatSessionPropertiesPanel
--- 34,41 ----
  import net.sourceforge.squirrel_sql.client.session.ISession;
  /**
!  * This panel allows the user to tailor DataType-specific settings for a session.
   *
   * @author <A HREF="mailto:co...@us...">Colin Bell</A>
+  * @author gwg
   */
  public class FormatSessionPropertiesPanel
***************
*** 57,63 ****
  	private final FormatPropertiesPanel _myPanel;
  
- 	/** Session properties object being maintained. */
- 	private SessionProperties _props;
- 
  
  	/**
--- 48,51 ----
***************
*** 84,89 ****
  	public void initialize(IApplication app)
  	{
! 		_props = _app.getSquirrelPreferences().getSessionProperties();
! 		_myPanel.loadData(_props);
  	}
  
--- 72,79 ----
  	public void initialize(IApplication app)
  	{
! 		// We need this method to satisfy one of the Interfaces we implement,
! 		// but since we have moved all operations to the DataType sub-panels
! 		// which initialize their own data during creation,
! 		// there is nothing for us to do here
  	}
  
***************
*** 91,100 ****
  		throws IllegalArgumentException
  	{
! 		if (session == null)
! 		{
! 			throw new IllegalArgumentException("Null ISession passed");
! 		}
! 		_props = session.getProperties();
! 		_myPanel.loadData(_props);
  	}
  
--- 81,88 ----
  		throws IllegalArgumentException
  	{
! 		// We need this method to satisfy one of the Interfaces we implement,
! 		// but since we have moved all operations to the DataType sub-panels
! 		// which initialize their own data during creation,
! 		// there is nothing for us to do here
  	}
  
***************
*** 116,120 ****
  	public void applyChanges()
  	{
! 		_myPanel.applyChanges(_props);
  	}
  
--- 104,108 ----
  	public void applyChanges()
  	{
! 		_myPanel.applyChanges();
  	}
  
***************
*** 127,140 ****
  		interface i18n
  		{
- 			String ALL_OTHER = "Display Unknown, non-standard or un-handled Data Types as String";
- 			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.";
  		}
  		
--- 115,120 ----
***************
*** 142,164 ****
  		OkJPanel[] dataTypePanels;
  
- 		private JCheckBox _showBlobChk = new JCheckBox(i18n.BLOB);
- 		private JCheckBox _showClobChk = new JCheckBox(i18n.CLOB);
- 
- 		private final ReadTypeCombo _blobTypeDrop = new ReadTypeCombo();
- 		private final ReadTypeCombo _clobTypeDrop = new ReadTypeCombo();
- 
- 		private IntegerField _showBlobSizeField = new IntegerField(5);
- 		private IntegerField _showClobSizeField = new IntegerField(5);
- 
- 		private JCheckBox _showSQLOtherChk = new JCheckBox(i18n.SQL_OTHER);
- 
- 		private JCheckBox _showAllOtherChk = new JCheckBox(i18n.ALL_OTHER);
- 
- 		/**
- 		 * This object will update the status of the GUI controls as the user
- 		 * makes changes.
- 		 */
- 		private final ControlMediator _controlMediator = new ControlMediator();
- 
  		FormatPropertiesPanel(IApplication app)
  		{
--- 122,125 ----
***************
*** 166,227 ****
  			createGUI(app);
  		}
  
! 		void loadData(SessionProperties props)
! 		{
! 			LargeResultSetObjectInfo largeObjInfo = props.getLargeResultSetObjectInfo();
! 
! 			_showBlobChk.setSelected(largeObjInfo.getReadBlobs());
! 			_showBlobSizeField.setInt(largeObjInfo.getReadBlobsSize());
! 			_blobTypeDrop.setSelectedIndex(largeObjInfo.getReadCompleteBlobs()
! 												? ReadTypeCombo.READ_ALL_IDX
! 												: ReadTypeCombo.READ_PARTIAL_IDX);
! 
! 			_showClobChk.setSelected(largeObjInfo.getReadClobs());
! 			_showClobSizeField.setInt(largeObjInfo.getReadClobsSize());
! 			_clobTypeDrop.setSelectedIndex(largeObjInfo.getReadCompleteClobs()
! 												? ReadTypeCombo.READ_ALL_IDX
! 												: ReadTypeCombo.READ_PARTIAL_IDX);
! 
! 			_showSQLOtherChk.setSelected(largeObjInfo.getReadSQLOther());
! 			_showAllOtherChk.setSelected(largeObjInfo.getReadAllOther());
! 
! 			updateControlStatus();
! 		}
! 
! 		void applyChanges(SessionProperties props)
! 		{
! 			LargeResultSetObjectInfo largeObjInfo = props.getLargeResultSetObjectInfo();
! 
! 			largeObjInfo.setReadBlobs(_showBlobChk.isSelected());
! 			largeObjInfo.setReadBlobsSize(_showBlobSizeField.getInt());
! 			largeObjInfo.setReadCompleteBlobs(
! 						_blobTypeDrop.getSelectedIndex() == ReadTypeCombo.READ_ALL_IDX);
! 
! 			largeObjInfo.setReadClobsSize(_showClobSizeField.getInt());
! 			largeObjInfo.setReadClobs(_showClobChk.isSelected());
! 			largeObjInfo.setReadCompleteClobs(
! 				_clobTypeDrop.getSelectedIndex() == ReadTypeCombo.READ_ALL_IDX);
! 
! 			largeObjInfo.setReadSQLOther(_showSQLOtherChk.isSelected());
! 			largeObjInfo.setReadAllOther(_showAllOtherChk.isSelected());
! 			
  			for (int i=0; i< dataTypePanels.length; i++)
  				dataTypePanels[i].ok();
  		}
  
- 		private void updateControlStatus()
- 		{
- 			final boolean showBlobs = _showBlobChk.isSelected();
- 			final boolean showPartialBlobs =
- 				_blobTypeDrop.getSelectedIndex() == ReadTypeCombo.READ_PARTIAL_IDX;
- 			_showBlobSizeField.setEnabled(showBlobs && showPartialBlobs);
- 			_blobTypeDrop.setEnabled(showBlobs);
- 
- 			final boolean showClobs = _showClobChk.isSelected();
- 			final boolean showPartialClobs =
- 				_clobTypeDrop.getSelectedIndex() == ReadTypeCombo.READ_PARTIAL_IDX;
- 			_showClobSizeField.setEnabled(showClobs && showPartialClobs);
- 			_clobTypeDrop.setEnabled(showClobs);
- 		}
  
  		private void createGUI(IApplication app)
--- 127,138 ----
  			createGUI(app);
  		}
+ 		
  
! 		void applyChanges()
! 		{		
  			for (int i=0; i< dataTypePanels.length; i++)
  				dataTypePanels[i].ok();
  		}
  
  
  		private void createGUI(IApplication app)
***************
*** 240,255 ****
  		private JPanel createDataTypesPanel()
  		{
- /*****
- 			_showBlobSizeField.setColumns(5);
- 			_showClobSizeField.setColumns(5);
- 
- 			_showBlobChk.addActionListener(_controlMediator);
- 			_showClobChk.addActionListener(_controlMediator);
- 			_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;
--- 151,156 ----
***************
*** 260,326 ****
  			gbc.gridy = 0;
  
! /*****
! 			pnl.add(new JLabel(""), gbc);
! 			
! 			++gbc.gridy;	// leave a blank line to separate text from header
! 			gbc.gridwidth = GridBagConstraints.REMAINDER;
! 
! 			JTextArea text1 = new JTextArea(i18n.BLOB_WARNING);
! 			text1.setEditable(false);
! 			pnl.add(text1, gbc);
! 
! 
! 			gbc.gridwidth = 1;
! 			++gbc.gridy;
! 			gbc.gridx = 0;
! 			pnl.add(_showBlobChk, gbc);
! 
! 			++gbc.gridx;
! 			pnl.add(new RightLabel("Read"), gbc);
! 
! 			++gbc.gridx;
! 			pnl.add(_blobTypeDrop, gbc);
! 
! 			++gbc.gridx;
! 			pnl.add(_showBlobSizeField, gbc);
! 			
! 			++gbc.gridx;
! 			pnl.add(new JLabel("Bytes"), gbc);
! 			
! 
! 			++gbc.gridy;
! 			gbc.gridx = 0;
! 			pnl.add(_showClobChk, gbc);			
! 			
! 			++gbc.gridx;
! 			pnl.add(new RightLabel("Read"), gbc);
! 
! 			++gbc.gridx;
! 			pnl.add(_clobTypeDrop, gbc);
! 
! 			++gbc.gridx;
! 			pnl.add(_showClobSizeField, gbc);
! 
! 			++gbc.gridx;
! 			pnl.add(new JLabel("Chars"), gbc);
! 
! 
! 			++gbc.gridy;	// leave blank line for visual separation
! 			pnl.add(new JLabel(""), gbc);
! 			
! 			++gbc.gridy;
! 			gbc.gridx = 0;
! 			gbc.gridwidth = GridBagConstraints.REMAINDER;
! 			JTextArea text2 = new JTextArea(i18n.OTHER_TYPE_WARNING);
! 			text2.setEditable(false);
! 			pnl.add(text2, gbc);
! 			
! 			++gbc.gridy;
! 			pnl.add(_showSQLOtherChk, gbc);
! 						
! 			++gbc.gridy;
! 			pnl.add(_showAllOtherChk, gbc);
! /************************************************************************************/
! 
  			dataTypePanels = CellComponentFactory.getControlPanels();
  			for (int i=0; i<dataTypePanels.length; i++) {
--- 161,166 ----
  			gbc.gridy = 0;
  
! 			// add each of the panels created by the DataType objects for
! 			// editing their own properties
  			dataTypePanels = CellComponentFactory.getControlPanels();
  			for (int i=0; i<dataTypePanels.length; i++) {
***************
*** 342,374 ****
  		}
  
- 		private static final class ReadTypeCombo extends JComboBox
- 		{
- 			static final int READ_ALL_IDX = 1;
- 			static final int READ_PARTIAL_IDX = 0;
- 
- 			ReadTypeCombo()
- 			{
- 				addItem("only the first");
- 				addItem("all");
- 			}
- 		}
- 
- 		/**
- 		 * This class will update the status of the GUI controls as the user
- 		 * makes changes.
- 		 */
- 		private final class ControlMediator implements ChangeListener,
- 															ActionListener
- 		{
- 			public void stateChanged(ChangeEvent evt)
- 			{
- 				updateControlStatus();
- 			}
- 
- 			public void actionPerformed(ActionEvent evt)
- 			{
- 				updateControlStatus();
- 			}
- 		}
  	}
  }
--- 182,186 ----
  		}
  
  	}
+ 
  }

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

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

Modified Files:
	CellComponentFactory.java 
Log Message:
cleanup LOB use


Index: CellComponentFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** CellComponentFactory.java	17 May 2004 16:32:31 -0000	1.26
--- CellComponentFactory.java	19 May 2004 14:31:26 -0000	1.27
***************
*** 30,34 ****
  import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
--- 30,33 ----
***************
*** 480,485 ****
  	  */
  	public static Object readResultSet(ColumnDisplayDefinition colDef,
! 		ResultSet rs, int index,
! 		LargeResultSetObjectInfo largeObjInfo)
  		throws java.sql.SQLException {
  			
--- 479,483 ----
  	  */
  	public static Object readResultSet(ColumnDisplayDefinition colDef,
! 		ResultSet rs, int index)
  		throws java.sql.SQLException {
  			

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql ResultSetReader.java,1.14,1.15

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

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

Modified Files:
	ResultSetReader.java 
Log Message:
cleanup LOB use


Index: ResultSetReader.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ResultSetReader.java	7 Apr 2004 02:30:26 -0000	1.14
--- ResultSetReader.java	19 May 2004 14:30:04 -0000	1.15
***************
*** 28,32 ****
  import java.sql.Types;
  
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  import net.sourceforge.squirrel_sql.fw.util.StringManager;
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
--- 28,31 ----
***************
*** 56,61 ****
  	private final int[] _columnIndices;
  
- 	/** Describes how to handle "blob" type data. */
- 	private final LargeResultSetObjectInfo _largeObjInfo;
  
  	/**
--- 55,58 ----
***************
*** 71,92 ****
  	private ResultSetMetaData _rsmd;
  
! 	public ResultSetReader(ResultSet rs) throws SQLException
! 	{
! 		this(rs, null, null);
! 	}
! 
! 	public ResultSetReader(ResultSet rs, LargeResultSetObjectInfo largeObjInfo)
  		throws SQLException
  	{
! 		this(rs, largeObjInfo, null);
  	}
  
- 	public ResultSetReader(ResultSet rs, int[] columnIndices) throws SQLException
- 	{
- 		this(rs, null, columnIndices);
- 	}
  
! 	public ResultSetReader(ResultSet rs, LargeResultSetObjectInfo largeObjInfo,
! 							int[] columnIndices) throws SQLException
  	{
  		super();
--- 68,80 ----
  	private ResultSetMetaData _rsmd;
  
! 	public ResultSetReader(ResultSet rs)
  		throws SQLException
  	{
! 		this(rs, null);
  	}
  
  
! 
! 	public ResultSetReader(ResultSet rs, int[] columnIndices) throws SQLException
  	{
  		super();
***************
*** 98,103 ****
  		_rs = rs;
  
- 		_largeObjInfo = largeObjInfo != null ? largeObjInfo : new LargeResultSetObjectInfo();
- 
  		if (columnIndices != null && columnIndices.length == 0)
  		{
--- 86,89 ----
***************
*** 179,182 ****
--- 165,170 ----
  	 * Method used to read data for all Tabs except the ContentsTab, where
  	 * the data is used only for reading.
+ 	 * The only data read in the non-ContentsTab tabs is Meta-data about the DB,
+ 	 * which means that there should be no BLOBs, CLOBs, or unknown fields.
  	 */
  	private Object[] doRead()
***************
*** 338,365 ****
  
  					case Types.BLOB:
! 						if (_largeObjInfo.getReadBlobs())
! 						{
  							row[i] = null;
  							Blob blob = _rs.getBlob(idx);
  							if (blob != null)
  							{
! 								int len = (int)blob.length();
! 								if (len > 0)
! 								{
! 									int bytesToRead = len;
! 									if (!_largeObjInfo.getReadCompleteBlobs())
! 									{
! 										bytesToRead = _largeObjInfo.getReadBlobsSize();
! 									}
! 									if (bytesToRead > len)
! 									{
! 										bytesToRead = len;
! 									}
! 									row[i] = new String(blob.getBytes(1, bytesToRead));
! 								}
! 							}
! 						}
! 						else
! 						{
  							row[i] = s_stringMgr.getString("ResultSetReader.blob");
  						}
--- 326,357 ----
  
  					case Types.BLOB:
! 						//	Since we are reading Meta-data about the DB, we should
! 						// never see a BLOB.   If we do, the contents are not interpretable
! 						// by Squirrel, so just tell the user that it is a BLOB and that it
! 						// has data.
! //??						if (_largeObjInfo.getReadBlobs())
! //??						{
  							row[i] = null;
  							Blob blob = _rs.getBlob(idx);
  							if (blob != null)
  							{
! //??								int len = (int)blob.length();
! //??								if (len > 0)
! //??								{
! //??									int bytesToRead = len;
! //??									if (!_largeObjInfo.getReadCompleteBlobs())
! //??									{
! //??										bytesToRead = _largeObjInfo.getReadBlobsSize();
! //??									}
! //??									if (bytesToRead > len)
! //??									{
! //??										bytesToRead = len;
! //??									}
! //??									row[i] = new String(blob.getBytes(1, bytesToRead));
! //??								}
! //??							}
! //??						}
! //??						else
! //??						{
  							row[i] = s_stringMgr.getString("ResultSetReader.blob");
  						}
***************
*** 367,372 ****
  
  					case Types.CLOB:
! 						if (_largeObjInfo.getReadClobs())
! 						{
  							row[i] = null;
  							Clob clob = _rs.getClob(idx);
--- 359,368 ----
  
  					case Types.CLOB:
! 						// Since we are reading Meta-data about the DB, we should
! 						// never see a CLOB.  However, if we do we assume that
! 						// it is printable text and that the user wants to see it, so
! 						// read in the entire thing.
! //??						if (_largeObjInfo.getReadClobs())
! //??						{
  							row[i] = null;
  							Clob clob = _rs.getClob(idx);
***************
*** 377,423 ****
  								{
  									int charsToRead = len;
! 									if (!_largeObjInfo.getReadCompleteClobs())
! 									{
! 										charsToRead = _largeObjInfo.getReadClobsSize();
! 									}
! 									if (charsToRead > len)
! 									{
! 										charsToRead = len;
! 									}
  									row[i] = clob.getSubString(1, charsToRead);
  								}
  							}
! 						}
! 						else
! 						{
! 							row[i] = s_stringMgr.getString("ResultSetReader.clob");
! 						}
  						break;
  
  					case Types.OTHER:
! 						if (_largeObjInfo.getReadSQLOther())
! 						{
! 							// Running getObject on a java class attempts
! 							// to load the class in memory which we don't want.
! 							// getString() just gets the value without loading
! 							// the class (at least under PostgreSQL).
! 							//row[i] = _rs.getObject(idx);
! 							row[i] = _rs.getString(idx);
! 						}
! 						else
! 						{
  							row[i] = s_stringMgr.getString("ResultSetReader.other");
! 						}
  						break;
  
  					default:
! 						if (_largeObjInfo.getReadAllOther())
! 						{
! 							row[i] = _rs.getObject(idx);
! 						}
! 						else
! 						{
  							row[i] = s_stringMgr.getString("ResultSetReader.unknown", new Object[] {new Integer(columnType)});
! 						}
  				}
  			}
--- 373,427 ----
  								{
  									int charsToRead = len;
! //??									if (!_largeObjInfo.getReadCompleteClobs())
! //??									{
! //??										charsToRead = _largeObjInfo.getReadClobsSize();
! //??									}
! //??									if (charsToRead > len)
! //??									{
! //??										charsToRead = len;
! //??									}
  									row[i] = clob.getSubString(1, charsToRead);
  								}
  							}
! //??						}
! //??						else
! //??						{
! //??							row[i] = s_stringMgr.getString("ResultSetReader.clob");
! //??						}
  						break;
  
  					case Types.OTHER:
! 						// Since we are reading Meta-data, there really should never be
! 						// a field with SQL type Other (1111).
! 						// If there is, we REALLY do not know how to handle it,
! 						// so do not attempt to read.
! //??						if (_largeObjInfo.getReadSQLOther())
! //??						{
! //??							// Running getObject on a java class attempts
! //??							// to load the class in memory which we don't want.
! //??							// getString() just gets the value without loading
! //??							// the class (at least under PostgreSQL).
! //??							//row[i] = _rs.getObject(idx);
! //??							row[i] = _rs.getString(idx);
! //??						}
! //??						else
! //??						{
  							row[i] = s_stringMgr.getString("ResultSetReader.other");
! //??						}
  						break;
  
  					default:
! 						// Since we are reading Meta-data, there should never be a
! 						// field with an unknown data type.
! 						// If there is, then we REALLY do not know how to handle it,
! 						// so do not attempt to read.
! //??						if (_largeObjInfo.getReadAllOther())
! //??						{
! //??							row[i] = _rs.getObject(idx);
! //??						}
! //??						else
! //??						{
  							row[i] = s_stringMgr.getString("ResultSetReader.unknown", new Object[] {new Integer(columnType)});
! 	//??					}
  				}
  			}
***************
*** 501,505 ****
  					default:
  						row[i] = CellComponentFactory.readResultSet(
! 								colDefs[i], _rs, idx, _largeObjInfo);
  
  						break;
--- 505,509 ----
  					default:
  						row[i] = CellComponentFactory.readResultSet(
! 								colDefs[i], _rs, idx);
  
  						break;

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql SQLDatabaseMetaData.java,1.12,1.13

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

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

Modified Files:
	SQLDatabaseMetaData.java 
Log Message:
cleanup LOB use


Index: SQLDatabaseMetaData.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLDatabaseMetaData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SQLDatabaseMetaData.java	6 Oct 2003 01:15:37 -0000	1.12
--- SQLDatabaseMetaData.java	19 May 2004 14:29:24 -0000	1.13
***************
*** 34,38 ****
  import java.util.TreeSet;
  
- import net.sourceforge.squirrel_sql.fw.datasetviewer.LargeResultSetObjectInfo;
  import net.sourceforge.squirrel_sql.fw.util.StringManager;
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
--- 34,37 ----
***************
*** 91,96 ****
  	private Map _cache = new HashMap();
  
- 	/** Defines how to handle result sets. */
- 	private LargeResultSetObjectInfo _lrsi;
  
  	/**
--- 90,93 ----
***************
*** 111,117 ****
  		_conn = conn;
  
- 		_lrsi = new LargeResultSetObjectInfo();
- 		_lrsi.setReadAllOther(true);
- 		_lrsi.setReadSQLOther(true);
  	}
  
--- 108,111 ----
***************
*** 279,283 ****
  		try
  		{
! 			final ResultSetReader rdr = new ResultSetReader(rs, _lrsi);
  			Object[] row = null;
  			while ((row = rdr.readRow()) != null)
--- 273,277 ----
  		try
  		{
! 			final ResultSetReader rdr = new ResultSetReader(rs);
  			Object[] row = null;
  			while ((row = rdr.readRow()) != null)
***************
*** 447,451 ****
  		try
  		{
! 			final ResultSetReader rdr = new ResultSetReader(rs, _lrsi);
  			Object[] row = null;
  			while ((row = rdr.readRow()) != null)
--- 441,445 ----
  		try
  		{
! 			final ResultSetReader rdr = new ResultSetReader(rs);
  			Object[] row = null;
  			while ((row = rdr.readRow()) != null)

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer ResultSetDataSet.java,1.12,1.13

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

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

Modified Files:
	ResultSetDataSet.java 
Log Message:
cleanup LOB use


Index: ResultSetDataSet.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/ResultSetDataSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ResultSetDataSet.java	7 Apr 2004 02:53:35 -0000	1.12
--- ResultSetDataSet.java	19 May 2004 14:28:43 -0000	1.13
***************
*** 52,67 ****
  	}
  
- 	public void setResultSet(ResultSet rs) throws DataSetException
- 	{
-  		setResultSet(rs, null, null, false);
- 	}
  
  	/**
  	 * Form used by Tabs other than ContentsTab
  	 */
! 	public void setResultSet(ResultSet rs, LargeResultSetObjectInfo largeObjInfo)
  		throws DataSetException
  	{
!  		setResultSet(rs, largeObjInfo, null, false);
  	}
  	
--- 52,63 ----
  	}
  
  
  	/**
  	 * Form used by Tabs other than ContentsTab
  	 */
! 	public void setResultSet(ResultSet rs)
  		throws DataSetException
  	{
!  		setResultSet(rs, null, false);
  	}
  	
***************
*** 70,78 ****
  	 */
  	public void setContentsTabResultSet(ResultSet rs, 
! 		String fullTableName,
! 		LargeResultSetObjectInfo largeObjInfo)
  		throws DataSetException
  	{
! 			setResultSet(rs, fullTableName, largeObjInfo, null, false, true);
  	}
  
--- 66,73 ----
  	 */
  	public void setContentsTabResultSet(ResultSet rs, 
! 		String fullTableName)
  		throws DataSetException
  	{
! 			setResultSet(rs, fullTableName, null, false, true);
  	}
  
***************
*** 80,84 ****
  		throws DataSetException
  	{
!  		setResultSet(rs, null, columnIndices, false);
  	}
  
--- 75,79 ----
  		throws DataSetException
  	{
!  		setResultSet(rs, columnIndices, false);
  	}
  
***************
*** 89,97 ****
  	 * for simplicity of operation.
  	 */
! 	public void setResultSet(ResultSet rs, LargeResultSetObjectInfo largeObjInfo,
   				 int[] columnIndices, boolean computeWidths)
   			throws DataSetException
  	{
! 		setResultSet(rs, null, largeObjInfo, columnIndices, computeWidths, false);
  	}
  
--- 84,92 ----
  	 * for simplicity of operation.
  	 */
! 	public void setResultSet(ResultSet rs,
   				 int[] columnIndices, boolean computeWidths)
   			throws DataSetException
  	{
! 		setResultSet(rs, null, columnIndices, computeWidths, false);
  	}
  
***************
*** 101,105 ****
  	 * all Tab classes
  	 */
! 	private void setResultSet(ResultSet rs, String fullTableName, LargeResultSetObjectInfo largeObjInfo,
   				 int[] columnIndices, boolean computeWidths, boolean isContentsTab)
   			throws DataSetException
--- 96,100 ----
  	 * all Tab classes
  	 */
! 	private void setResultSet(ResultSet rs, String fullTableName, 
   				 int[] columnIndices, boolean computeWidths, boolean isContentsTab)
   			throws DataSetException
***************
*** 107,115 ****
  		reset();
  
- 		if (largeObjInfo == null)
- 		{
- 			largeObjInfo = new LargeResultSetObjectInfo();
- 		}
- 
  		if (columnIndices != null && columnIndices.length == 0)
  		{
--- 102,105 ----
***************
*** 135,139 ****
  
   				// Read the entire row, since some drivers complain if columns are read out of sequence
!  				ResultSetReader rdr = new ResultSetReader(rs, largeObjInfo, null);
  				Object[] row = null;
  
--- 125,129 ----
  
   				// Read the entire row, since some drivers complain if columns are read out of sequence
!  				ResultSetReader rdr = new ResultSetReader(rs, null);
  				Object[] row = null;
  

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel SQLExecuterTask.java,1.15,1.16

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

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

Modified Files:
	SQLExecuterTask.java 
Log Message:
cleanup LOB use


Index: SQLExecuterTask.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecuterTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SQLExecuterTask.java	23 Dec 2003 10:41:42 -0000	1.15
--- SQLExecuterTask.java	19 May 2004 14:27:27 -0000	1.16
***************
*** 331,335 ****
  		_results.add(rsds);
  		SessionProperties props = _session.getProperties();
! 		rsds.setResultSet(rs, props.getLargeResultSetObjectInfo());
  		if (_stopExecution)
  		{
--- 331,335 ----
  		_results.add(rsds);
  		SessionProperties props = _session.getProperties();
! 		rsds.setResultSet(rs);
  		if (_stopExecution)
  		{

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/procedure ProcedureColumnsTab.java,1.2,1.3

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

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

Modified Files:
	ProcedureColumnsTab.java 
Log Message:
cleanup LOB use


Index: ProcedureColumnsTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/procedure/ProcedureColumnsTab.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProcedureColumnsTab.java	27 Apr 2003 10:09:13 -0000	1.2
--- ProcedureColumnsTab.java	19 May 2004 14:26:20 -0000	1.3
***************
*** 74,78 ****
  			{
  				final ResultSetDataSet rsds = new ResultSetDataSet();
! 				rsds.setResultSet(rs, getSession().getProperties().getLargeResultSetObjectInfo());
  				return rsds;
  			}
--- 74,78 ----
  			{
  				final ResultSetDataSet rsds = new ResultSetDataSet();
! 				rsds.setResultSet(rs);
  				return rsds;
  			}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table VersionColumnsTab.java,1.2,1.3

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

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

Modified Files:
	VersionColumnsTab.java 
Log Message:
cleanup LOB use


Index: VersionColumnsTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/VersionColumnsTab.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VersionColumnsTab.java	25 Mar 2003 03:21:11 -0000	1.2
--- VersionColumnsTab.java	19 May 2004 14:25:24 -0000	1.3
***************
*** 74,78 ****
  			{
  				final ResultSetDataSet rsds = new ResultSetDataSet();
! 				rsds.setResultSet(rs, getSession().getProperties().getLargeResultSetObjectInfo());
  				return rsds;
  			}
--- 74,78 ----
  			{
  				final ResultSetDataSet rsds = new ResultSetDataSet();
! 				rsds.setResultSet(rs);
  				return rsds;
  			}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table TablePriviligesTab.java,1.2,1.3

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

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

Modified Files:
	TablePriviligesTab.java 
Log Message:
cleanup LOB use


Index: TablePriviligesTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/TablePriviligesTab.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TablePriviligesTab.java	25 Mar 2003 03:21:11 -0000	1.2
--- TablePriviligesTab.java	19 May 2004 14:25:06 -0000	1.3
***************
*** 74,78 ****
  			{
  				final ResultSetDataSet rsds = new ResultSetDataSet();
! 	 			rsds.setResultSet(rs, getSession().getProperties().getLargeResultSetObjectInfo(), new int[] { 5, 6, 7, 4 }, true);
  				return rsds;
  			}
--- 74,78 ----
  			{
  				final ResultSetDataSet rsds = new ResultSetDataSet();
! 	 			rsds.setResultSet(rs, new int[] { 5, 6, 7, 4 }, true);
  				return rsds;
  			}