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

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/action EditWhereColsAction.java,NONE,1.1

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

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

Added Files:
	EditWhereColsAction.java 
Log Message:
hooks for EditWhereCols function


--- NEW FILE: EditWhereColsAction.java ---
package net.sourceforge.squirrel_sql.client.session.action;
/**
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 * @author gwg
 *
 */
import java.awt.event.ActionEvent;

import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.gui.CursorChanger;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
/**
 * EditWhereColsAction.java
 *
 * Adapted from SQLFilterAction.java by Maury Hammel.
 */
public class EditWhereColsAction extends SquirrelAction implements ISessionAction
{
	/** The SQuirreL session instance for which this SQL Filter Action applies. */
	private ISession _session;

	/** The SQuirreL application instance. */
	private IApplication _app;

	/** Creates a new instance of SQLFilterAction
	* @param app A reference to the SQuirreL application instance
	*/
	public EditWhereColsAction(IApplication app)
	{
		super(app);
		_app = app;
	}

	/** Sets the _session variable with a reference to the current SQuirrel session
	 * instance.
	 * @param session A reference to the current SQuirrel session instance.
	 */
	public void setSession(ISession session)
	{
		_session = session;
	}

	/** Invoked when an action occurs.
	* @param e The event that triggered this procedure.
	*/
	public void actionPerformed(ActionEvent e)
	{
		if (_session != null)
		{
			// Ensure that the proper type of Object is selected in the Object Tree before allowing the SQL Filter to be activated.

			IDatabaseObjectInfo selectedObjects[] =	_session.getObjectTreeAPI(_app.getDummyAppPlugin()).getSelectedDatabaseObjects();
			int objectTotal = selectedObjects.length;

			if ((objectTotal > 0)
				&& (selectedObjects[0].getDatabaseObjectType()
					== DatabaseObjectType.TABLE))
			{
				CursorChanger cursorChg =
					new CursorChanger(getApplication().getMainFrame());
				cursorChg.show();
				try
				{
					new EditWhereColsCommand(_session, selectedObjects[0]).execute();
				}
				finally
				{
					cursorChg.restore();
				}
			}
			else
			{
				_session.getMessageHandler().showMessage(
					"You must have a single table selected to limit the colums used in the Edit WHERE clause");
			}
		}
	}
}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table ContentsTab.java,1.23,1.24

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

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


Index: ContentsTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ContentsTab.java	25 Feb 2004 13:33:14 -0000	1.23
--- ContentsTab.java	20 Apr 2004 19:47:38 -0000	1.24
***************
*** 19,23 ****
   */
  import java.sql.DatabaseMetaData;
- import java.sql.Types;
  import java.sql.ResultSet;
  import java.sql.SQLException;
--- 19,22 ----
***************
*** 25,28 ****
--- 24,28 ----
  import java.sql.PreparedStatement;
  import javax.swing.JOptionPane;
+ import java.util.HashMap;
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
***************
*** 37,42 ****
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  
- import net.sourceforge.squirrel_sql.fw.sql.ISQLDriver;
- 
  import net.sourceforge.squirrel_sql.client.session.ISession;
  import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
--- 37,40 ----
***************
*** 44,47 ****
--- 42,47 ----
  import net.sourceforge.squirrel_sql.client.session.sqlfilter.SQLFilterClauses;
  import net.sourceforge.squirrel_sql.client.session.sqlfilter.WhereClausePanel;
+ import net.sourceforge.squirrel_sql.client.session.properties.EditWhereCols;
+ 
  /**
   * This is the tab showing the contents (data) of the table.
***************
*** 62,65 ****
--- 62,71 ----
  	 */
  	String previousTableName = "";
+ 	
+ 	/**
+ 	 * This is the long name of the current table including everything that might be able to distinguish it
+ 	 * from another table of the same name in a different DB.
+ 	 */
+ 	String fullTableName = null;
  
  	/**
***************
*** 116,119 ****
--- 122,145 ----
  		return i18n.HINT;
  	}
+ 	
+ 	/**
+ 	 * Get the full name of this table, creating that name the first time we are called
+ 	 */
+ 	private String getFullTableName() {
+ 		if (fullTableName == null) {
+ 			try {
+ 				final ISession session = getSession();
+ 				final ITableInfo ti = getTableInfo();
+ 				
+ 				fullTableName = session.getAlias().getUrl()+":"+
+ 					ti.getCatalogName()+":"+ti.getSchemaName()+
+ 					":"+ti.getSimpleName();
+ 			}
+ 			catch (Exception e) {
+ 					// not sure what to do with this exception???
+ 			}
+ 		}
+ 		return fullTableName;
+ 	}
  
  	/**
***************
*** 306,313 ****
  				// We also include the URL used to connect to the DB so that
  				// the same table/DB on different machines is treated differently.
! 				String fullTableName = session.getAlias().getUrl()+":"+
! 					ti.getCatalogName()+":"+ti.getSchemaName()+
! 					":"+ti.getSimpleName();
! 				rsds.setContentsTabResultSet(rs, fullTableName, props.getLargeResultSetObjectInfo());
  
  				// KLUDGE:
--- 332,336 ----
  				// We also include the URL used to connect to the DB so that
  				// the same table/DB on different machines is treated differently.
! 				rsds.setContentsTabResultSet(rs, getFullTableName(), props.getLargeResultSetObjectInfo());
  
  				// KLUDGE:
***************
*** 618,623 ****
--- 641,659 ----
  
  		StringBuffer whereClause = new StringBuffer("");
+ 		
+ 		// For tables that have a lot of columns, the user may have limited the set of columns
+ 		// to use in the where clause, so see if there is a table of col names
+ 		HashMap colNames = (EditWhereCols.getInstance()).get(getFullTableName());
  
  		for (int i=0; i< colDefs.length; i++) {
+ 			
+ 			// if the user has said to not use this column, then skip it
+ 			if (colNames != null) {
+ 				// the user has restricted the set of columns to use.
+ 				// If this name is NOT in the list, then skip it; otherwise we fall through
+ 				// and use the column in the WHERE clause
+ 				if (colNames.get(colDefs[i].getLabel()) == null)
+ 					continue;	// go on to the next item
+ 			}
  
  			// for the column that is being changed, use the value
***************
*** 635,639 ****
  			String clause = CellComponentFactory.getWhereClauseValue(colDefs[i], value);	
  
- 
  			if (clause != null && clause.length() > 0)
  				if (whereClause.length() == 0)
--- 671,674 ----

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

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

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

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


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

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties EditWhereCols.java,NONE,1.1

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

Added Files:
	EditWhereCols.java 
Log Message:
data object for eponymous option


--- NEW FILE: EditWhereCols.java ---
package net.sourceforge.squirrel_sql.client.session.properties;
/*
 * Copyright (C) 2001-2003 Colin Bell
 * co...@us...
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
/**
 * @author gwg
 * Object to save, manage and restore lists of specific columns
 * to use in the WHERE clause when doing editing of cells in tables as
 * in the ContentsTab.
 */

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

public class EditWhereCols {
	/**
	 * The singleton instance of this object
	 */
	private static EditWhereCols singleton = null;
	
	/**
	 * The version of the data suitible for loading/unloading from/to files.
	 * The internal representation is a HashMap containing HashMaps containing strings.
	 * The XMLReader/Writer Beans in fw.xml do not handle the general case of HashMaps,
	 * so rather than trying to handle that there, we just convert the data internally into a form
	 * that those classes can handle, i.e. an array of strings.
	 * Each string consists of the name of the table, a space, then a comma-separated list of
	 * all of the columns that SHOULD be used in the WHERE clause when doing editing operations.
	 */
	private String[] dataArray = new String[0];
	
	/**
	 * The mapping from table name to object (also a HashMap)
	 * containing the list of names of columns to use in WHERE clause.
	 */
	private HashMap tables = new HashMap();
	
	/**
	 * Singleton - do not allow external objects to create instances of this
	 */
	private EditWhereCols() {}
	
	/**
	 * let external objects get a copy of this singleton,
	 * creating the instance the first time it is accessed.
	 */
	static public EditWhereCols getInstance() {
		if (singleton == null)
			singleton = new EditWhereCols();
		return singleton;
	}
	
	/**
	 * get the data from the instance
	 */
	public HashMap getTables() {
		return tables;
	}
	
	/**
	 * get data in form that can be used to output to file
	 */
	public String[] getDataArray() {
		// first convert internal data into the string array
		dataArray = new String[tables.size()];
		Iterator keys = tables.keySet().iterator();
		int index = 0;
		
		// get each table's info
		while (keys.hasNext()) {
			String tableName = (String)keys.next();
			HashMap h = (HashMap)tables.get(tableName);
			Iterator columnNames = h.keySet().iterator();
			String outData = tableName + " ";
			while (columnNames.hasNext()) {
				String colName = (String)columnNames.next();
				outData += colName;
				if (columnNames.hasNext())
					outData +=  ",";
			}
			
			// put this into the data array
			dataArray[index++] = outData;
		}

		return dataArray;
	}
	
	/**
	 * Data in the external form (array of strings) is passed in and must be converted
	 * to the internal form.
	 * @param inData array of strings in form "tableName col,col,col..."
	 */
	public void setDataArray(String[] inData) {
		tables = new HashMap();	// make sure we are starting clean
		
		// convert each string into key+HashMap and fill it into the data
		for (int i=0; i< inData.length; i++) {
			int endIndex = inData[i].indexOf(" ");
			String tableName = inData[i].substring(0, endIndex);
			
			int startIndex;
			ArrayList colList = new ArrayList();
			while (true) {
				startIndex = endIndex+1;
				endIndex = inData[i].indexOf(',', startIndex);
				if (endIndex == -1) {
					// we are at the last one in the list
					colList.add(inData[i].substring(startIndex));
					break;
				}
				colList.add(inData[i].substring(startIndex, endIndex));
			}
		}
	}

	/**
	 * add or replace a table-name/hashmap-of-column-names mapping.
	 * If map is null, remove the entry from the tables.
	 */
	public void put(String tableName, HashMap colNames) {
		if (colNames == null)
			tables.remove(tableName);
		else 
			tables.put(tableName, colNames);
		return;
	}
	
	/**
	 * get the HashMap of column names for the given table name.
	 * it will be null if the table does not have any limitation on the columns to use.
	 */
	public HashMap get(String tableName) {
		return (HashMap)tables.get(tableName);
	}
}

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

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

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

Modified Files:
	ApplicationFiles.java 
Log Message:
hook for EditWhereCols


Index: ApplicationFiles.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/util/ApplicationFiles.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ApplicationFiles.java	18 Feb 2004 22:18:57 -0000	1.9
--- ApplicationFiles.java	20 Apr 2004 19:44:25 -0000	1.10
***************
*** 125,129 ****
  		return new File(_userSettingsDir + File.separator + "prefs.xml");
  	}
! 	
  	/**
  	 * @return file that contains the selections user chose for Cell import/export.
--- 125,129 ----
  		return new File(_userSettingsDir + File.separator + "prefs.xml");
  	}
! 
  	/**
  	 * @return file that contains the selections user chose for Cell import/export.
***************
*** 133,136 ****
--- 133,146 ----
  		return new File(_userSettingsDir + File.separator + "cellImportExport.xml");
  	}
+ 	
+ 	/**
+ 	 * @return file that contains the selections user chose for specific columns to use
+ 	 * in the WHERE clause when editing a cell in a DB table.
+ 	 */
+ 	public File getEditWhereColsFile()
+ 	{
+ 		return new File(_userSettingsDir + File.separator + "editWhereCols.xml");
+ 	}
+ 	
  
  	/**

[Squirrel-sql-commits] sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax SyntaxPugin.java,1.4,1.5

[Colin B. <co...@us...>]

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

Modified Files:
	SyntaxPugin.java 
Log Message:
Changes to get 1.2beta5 out the door

Index: SyntaxPugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPugin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SyntaxPugin.java	13 Dec 2003 10:53:07 -0000	1.4
--- SyntaxPugin.java	19 Apr 2004 12:08:42 -0000	1.5
***************
*** 180,188 ****
  	/**
  	 * Application is shutting down so save preferences.
- 	 *
- 	 * @throws	PluginException
- 	 * 			Thrown if an error occurs.
  	 */
! 	public void unload() throws PluginException
  	{
  		savePrefs();
--- 180,185 ----
  	/**
  	 * Application is shutting down so save preferences.
  	 */
! 	public void unload()
  	{
  		savePrefs();

[Squirrel-sql-commits] sql12/build build.xml,1.13,1.14

[Colin B. <co...@us...>]

Update of /cvsroot/squirrel-sql/sql12/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26266/build

Modified Files:
	build.xml 
Log Message:
Changes to get 1.2beta5 out the door

Index: build.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/build/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** build.xml	3 Feb 2004 10:45:31 -0000	1.13
--- build.xml	19 Apr 2004 12:08:41 -0000	1.14
***************
*** 276,282 ****
--- 276,284 ----
  		</antcall>
  -->
+ <!--
  		<antcall target="build_plugin">
  			<param name="p_internal_name" value="sessionscript"/>
  		</antcall>
+ -->
  <!--
  		<antcall target="build_plugin">
***************
*** 289,297 ****
  		</antcall>
  -->
- <!--
  		<antcall target="build_plugin">
  			<param name="p_internal_name" value="syntax"/>
  		</antcall>
- -->
  	</target>
  
--- 291,297 ----

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/plugin DefaultPlugin.java,1.4,1.5 IPlugin.java,1.3,1.4

[Colin B. <co...@us...>]

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

Modified Files:
	DefaultPlugin.java IPlugin.java 
Log Message:
Changes to get 1.2beta5 out the door

Index: IPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/plugin/IPlugin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IPlugin.java	17 Feb 2004 20:02:04 -0000	1.3
--- IPlugin.java	19 Apr 2004 12:08:33 -0000	1.4
***************
*** 48,53 ****
  	/**
  	 * Called when app shutdown.
  	 */
! 	void unload() throws PluginException;
  
  	/**
--- 48,54 ----
  	/**
  	 * Called when app shutdown.
+ 	 * TODO: Put throws clause back in
  	 */
! 	void unload(); //throws PluginException;
  
  	/**

Index: DefaultPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/plugin/DefaultPlugin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultPlugin.java	13 Dec 2003 10:53:07 -0000	1.4
--- DefaultPlugin.java	19 Apr 2004 12:08:32 -0000	1.5
***************
*** 72,77 ****
  	 *			Thrown if an error occurs.
  	 */
! 	public void unload() throws PluginException
  	{
  		// Empty method.
  	}
--- 72,78 ----
  	 *			Thrown if an error occurs.
  	 */
! 	public void unload() // throws PluginException
  	{
+ 		// TODO: Put throws clause back in
  		// Empty method.
  	}

[Squirrel-sql-commits] sql12/plugins/syntax plugin_build.xml,1.2,1.3

[Colin B. <co...@us...>]

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

Modified Files:
	plugin_build.xml 
Log Message:
Changes to get 1.2beta5 out the door

Index: plugin_build.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/plugin_build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plugin_build.xml	20 Jul 2003 09:57:25 -0000	1.2
--- plugin_build.xml	19 Apr 2004 12:08:42 -0000	1.3
***************
*** 8,12 ****
  		<tstamp/>
  		<property name="internal_name" value="syntax"/>
! 		<property name="version" value="0.11"/>
  
  		<property name="debug" value="on"/>
--- 8,12 ----
  		<tstamp/>
  		<property name="internal_name" value="syntax"/>
! 		<property name="version" value="0.12"/>
  
  		<property name="debug" value="on"/>

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeString.java,1.17,1.18

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

Modified Files:
	DataTypeString.java 
Log Message:
allow tabs and newlines for string data types


Index: DataTypeString.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeString.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DataTypeString.java	7 Apr 2004 02:46:24 -0000	1.17
--- DataTypeString.java	17 Apr 2004 03:43:01 -0000	1.18
***************
*** 281,289 ****
  				e.consume();
  				_theComponent.getToolkit().beep();
! 								
! 				// tabs and newlines get put into the text before this check,
! 				// so remove them
! 				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER)
! 					((IRestorableTextComponent)_theComponent).updateText(text.substring(0, text.length()-1));
  			}
  
--- 281,286 ----
  				e.consume();
  				_theComponent.getToolkit().beep();
! 				
! 				// Note: tabs and newlines are allowed in string fields, even though they are unusual.
  			}
  

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

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

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

Modified Files:
	DataTypeTime.java 
Log Message:
better string handling


Index: DataTypeTime.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeTime.java	7 Apr 2004 02:46:42 -0000	1.5
--- DataTypeTime.java	17 Apr 2004 03:35:57 -0000	1.6
***************
*** 267,280 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 267,272 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

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

Modified Files:
	DataTypeTimestamp.java 
Log Message:
better string handling


Index: DataTypeTimestamp.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTimestamp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeTimestamp.java	7 Apr 2004 02:47:12 -0000	1.5
--- DataTypeTimestamp.java	17 Apr 2004 03:35:02 -0000	1.6
***************
*** 267,280 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 267,272 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

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

Modified Files:
	DataTypeShort.java 
Log Message:
better string handling


Index: DataTypeShort.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeShort.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeShort.java	7 Apr 2004 02:46:10 -0000	1.5
--- DataTypeShort.java	17 Apr 2004 03:34:06 -0000	1.6
***************
*** 279,292 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 279,284 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

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

Modified Files:
	DataTypeLong.java 
Log Message:
better string handling


Index: DataTypeLong.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeLong.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeLong.java	7 Apr 2004 02:44:48 -0000	1.5
--- DataTypeLong.java	17 Apr 2004 03:33:53 -0000	1.6
***************
*** 279,292 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 279,284 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeInteger.java,1.17,1.18

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

Modified Files:
	DataTypeInteger.java 
Log Message:
better string handling


Index: DataTypeInteger.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeInteger.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DataTypeInteger.java	7 Apr 2004 02:44:31 -0000	1.17
--- DataTypeInteger.java	17 Apr 2004 03:33:37 -0000	1.18
***************
*** 279,292 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 279,284 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

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

Modified Files:
	DataTypeFloat.java 
Log Message:
better string handling


Index: DataTypeFloat.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeFloat.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeFloat.java	7 Apr 2004 02:43:37 -0000	1.5
--- DataTypeFloat.java	17 Apr 2004 03:33:21 -0000	1.6
***************
*** 274,287 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 274,279 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

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

Modified Files:
	DataTypeDouble.java 
Log Message:
better string handling


Index: DataTypeDouble.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDouble.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeDouble.java	7 Apr 2004 02:43:12 -0000	1.5
--- DataTypeDouble.java	17 Apr 2004 03:33:08 -0000	1.6
***************
*** 274,287 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 274,279 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

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

Modified Files:
	DataTypeDate.java 
Log Message:
better string handling


Index: DataTypeDate.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeDate.java	7 Apr 2004 02:42:50 -0000	1.5
--- DataTypeDate.java	17 Apr 2004 03:32:53 -0000	1.6
***************
*** 267,280 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 267,272 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

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

Modified Files:
	DataTypeByte.java 
Log Message:
better string handling


Index: DataTypeByte.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeByte.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataTypeByte.java	7 Apr 2004 02:40:34 -0000	1.5
--- DataTypeByte.java	17 Apr 2004 03:32:39 -0000	1.6
***************
*** 279,292 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 279,284 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

Modified Files:
	DataTypeBoolean.java 
Log Message:
better string handling


Index: DataTypeBoolean.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBoolean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DataTypeBoolean.java	7 Apr 2004 02:40:21 -0000	1.6
--- DataTypeBoolean.java	17 Apr 2004 03:32:25 -0000	1.7
***************
*** 285,298 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 285,290 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

Modified Files:
	DataTypeBinary.java 
Log Message:
better string handling


Index: DataTypeBinary.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBinary.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DataTypeBinary.java	7 Apr 2004 02:39:38 -0000	1.8
--- DataTypeBinary.java	17 Apr 2004 03:32:06 -0000	1.9
***************
*** 289,302 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					int cIndex = text.indexOf(c);
! 					String newText = null;
! 					if (cIndex == 0)
! 						newText = text.substring(1);
! 					else if (cIndex == text.length()-1)
! 						newText = text.substring(0, text.length()-1);
! 					else
! 						newText = text.substring(0, cIndex) + text.substring(cIndex+1);
! 
! 					((IRestorableTextComponent)_theComponent).updateText(newText);
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 289,294 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

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

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

Modified Files:
	DataTypeBigDecimal.java 
Log Message:
better string handling


Index: DataTypeBigDecimal.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBigDecimal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DataTypeBigDecimal.java	7 Apr 2004 02:39:23 -0000	1.6
--- DataTypeBigDecimal.java	17 Apr 2004 03:31:52 -0000	1.7
***************
*** 301,305 ****
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					((IRestorableTextComponent)_theComponent).updateText(text.substring(0, text.length()-1));
  					_theComponent.getToolkit().beep();
  					e.consume();
--- 301,306 ----
  				// not passed to this level by the in-cell editor.
  				if (c == KeyEvent.VK_TAB || c == KeyEvent.VK_ENTER) {
! 					// remove all instances of the offending char
! 					((IRestorableTextComponent)_theComponent).updateText( text.replaceAll(""+c, ""));
  					_theComponent.getToolkit().beep();
  					e.consume();

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer DataSetViewerTablePanel.java,1.17,1.18

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

Modified Files:
	DataSetViewerTablePanel.java 
Log Message:
fix keyboard entry to cells with <null> contents


Index: DataSetViewerTablePanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DataSetViewerTablePanel.java	7 Apr 2004 02:56:28 -0000	1.17
--- DataSetViewerTablePanel.java	17 Apr 2004 03:08:52 -0000	1.18
***************
*** 24,28 ****
  import java.awt.event.MouseAdapter;
  import java.awt.event.MouseEvent;
! 
  
  import javax.swing.DefaultCellEditor;
--- 24,28 ----
  import java.awt.event.MouseAdapter;
  import java.awt.event.MouseEvent;
! import java.awt.event.KeyEvent;
  
  import javax.swing.DefaultCellEditor;
***************
*** 44,47 ****
--- 44,48 ----
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
+ import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField;
  
  public class DataSetViewerTablePanel extends BaseDataSetViewerDestination
***************
*** 136,233 ****
  	}
  
- //??	protected final static class MyTableModel extends AbstractTableModel
- //??	{
- //??		private List _data = new ArrayList();
- //??		private ColumnDisplayDefinition[] _colDefs = new ColumnDisplayDefinition[0];
- //??		private IDataSetTableControls _creator = null;
- //??
- //??
- //??		MyTableModel(IDataSetTableControls creator)
- //??		{
- //??			super();
- //??			_creator = creator;
- //??		}
- //??
- //??		/**
- //??		 * Determine whether the cell is editable by asking the creator whether
- //??		 * the table is editable or not
- //??		 */
- //??		public boolean isCellEditable(int row, int col)
- //??		{
- //??			return _creator.isColumnEditable(col, getValueAt(row, col));
- //??		}
- //??
- //??		public Object getValueAt(int row, int col)
- //??		{
- //??			return ((Object[])_data.get(row))[col];
- //??		}
- //??
- //??		public int getRowCount()
- //??		{
- //??			return _data.size();
- //??		}
- //??
- //??		public int getColumnCount()
- //??		{
- //??			return _colDefs != null ? _colDefs.length : 0;
- //??		}
- //??
- //??		public String getColumnName(int col)
- //??		{
- //??			return _colDefs != null ? _colDefs[col].getLabel() : super.getColumnName(col);
- //??		}
- //??
- //??		public Class getColumnClass(int col)
- //??		{
- //??			try
- //??			{
- //??				// if no columns defined, return a generic class
- //??				// to avoid anything throwing an exception.
- //??				if (_colDefs == null)
- //??				{
- //??					return Object.class;
- //??				}
- //??			
- //??				return Class.forName(_colDefs[col].getClassName());
- //??			}
- //??			catch (Exception e)
- //??			{
- //??				return null;
- //??			}
- //??		}
- //??
- //??		void setHeadings(ColumnDisplayDefinition[] hdgs)
- //??		{
- //??			_colDefs = hdgs;
- //??		}
- //??
- //??		public void addRow(Object[] row)
- //??		{
- //??			_data.add(row);
- //??		}
- //??
- //??		void clear()
- //??		{
- //??			_data.clear();
- //??		}
- //??
- //??		public void allRowsAdded()
- //??		{
- //??			fireTableStructureChanged();
- //??		}
- //??
- //??		/**
- //??		 * Let creator handle saving the data, if anything is to be done with it.
- //??		 * If the creator succeeds in changing the underlying data,
- //??		 * then update the JTable as well.
- //??		 */
- //??		public void setValueAt(Object newValue, int row, int col) {
- //??			if ( _creator.changeUnderlyingValueAt(row, col, newValue, getValueAt(row, col)))
- //??			{
- //??				((Object[])_data.get(row))[col] = newValue;
- //??			}
- //??		}
- //??	}
  
  	protected final class MyJTable extends JTable
  	{
--- 137,144 ----
  	}
  
  
+ 	/*
+ 	 * The JTable used for displaying all DB ResultSet info.
+ 	 */
  	protected final class MyJTable extends JTable
  	{
***************
*** 258,261 ****
--- 169,173 ----
  			// just in case table is editable, call creator to set up cell editors
  			_creator.setCellEditors(this);
+ 			setSurrendersFocusOnKeystroke(true);
  		}
  		
***************
*** 264,267 ****
--- 176,184 ----
  		}
  
+ /***********************************************************
+  * I used to think that the following function was needed, but the problem does not
+  * seem to occur now.  Also, I have added "setSurrendersFocusOnKeystroke(true)
+  * in the constructor, so that should take care of the issue for which this function was
+  * created.  I am leaving the code commented out for a little while in case someone sees a problem.
  		// JTable is inconsistant with passing events such as key strokes
  		// into the components of CellEditors depending on whether you enter
***************
*** 280,283 ****
--- 197,201 ----
  		// document at the Sun Java site that recommends processing key presses in
  		// this way, so it should work.
+ 
  		public boolean editCellAt(int row, int col) {
  			boolean result = super.editCellAt(row, col);
***************
*** 287,290 ****
--- 205,209 ----
  			return result;
  		}
+ ************************/
  
  		/*
***************
*** 301,304 ****
--- 220,285 ----
  		}
  		
+ 		
+ 		/**
+ 		 * There are two special cases where we need to override the default behavior
+ 		 * when we begin cell editing.  For some reason, when you use the keyboard to
+ 		 * enter a cell (tab, enter, arrow keys, etc), the first character that you type
+ 		 * after entering the field is NOT passed through the KeyListener mechanism
+ 		 * where we have the special handling in the DataTypes.  Instead, it is passed
+ 		 * through the KeyMap and Action mechanism, and the default Action on the
+ 		 * JTextField is to add the character to the end of the existing text, or if it is delete
+ 		 * to delete the last character of the existing text.  In most cases, this is ok, but
+ 		 * there are three special cases of which we only handle two here:
+ 		 * 	- If the data field currently contains "<null>" and the user types a character,
+ 		 * 	  we want that character to replace the string "<null>", which represents the
+ 		 * 	  null value.  In this case we process the event normally, which usually adds
+ 		 * 	  the char to the end of the string, then remove the char afterwards.
+ 		 * 	  We take this approach rather than just immediately replacing the "<null>"
+ 		 * 	  with the char because there are some chars that should not be put into
+ 		 * 	  the editable text, such as control-characters.
+ 		 * 	- If the data field contains "<null>" and the user types a delete, we do not
+ 		 * 	  want to delete the last character from the string "<null>" since that string
+ 		 * 	  represents the null value.  In this case we simply ignore the user input.
+ 		 * 	- Whether or not the field initially contains null, we do not run the input validation
+ 		 * 	  function for the DataType on the input character.  This means that the user
+ 		 * 	  can type an illegal character into the field.  For example, after entering an
+ 		 * 	  Integer field by typing a tab, the user can enter a letter (e.g. "a") into that
+ 		 * 	  field.  The normal keyListener processing prevents that, but we cannot
+ 		 * 	  call it from this point.  (More accurately, I cannot figure out how to do it
+ 		 * 	  easilly.)  Thus the user may enter one character of invalid data into the field.
+ 		 * 	  This is not too serious a problem, however, because the normal validation
+ 		 * 	  is still done when the user leaves the field and it SQuirreL tries to convert
+ 		 * 	  the text into an object of the correct type, so errors of this nature will still
+ 		 * 	  be caught.  They just won't be prevented.
+ 		 */
+ 		public void processKeyEvent(KeyEvent e) {
+ 			
+ 				// handle special case of delete with <null> contents
+ 				if (e.getKeyChar() == '\b' && getEditorComponent() != null &&
+ 						((RestorableJTextField)getEditorComponent()).getText().equals("<null>") ) {
+ 						//ignore the user input
+ 						return;
+ 				}
+ 
+ 				// generally for KEY_TYPED this means add the typed char to the end of the text,
+ 				// but there are some things (e.g. control chars) that are ignored, so let the
+ 				// normal processing do its thing
+ 				super.processKeyEvent(e);
+                 
+ 				// now check to see if the original contents were <null>
+ 				// and we have actually added the input char to the end of it                                                              
+ 				if (getEditorComponent() != null) {
+ 						if (e.getID() == KeyEvent.KEY_TYPED && ((RestorableJTextField)getEditorComponent()).getText().length() == 7) {
+ 								// check that we did not just add a char to a <null>
+ 								if (((RestorableJTextField)getEditorComponent()).getText().equals("<null>"+e.getKeyChar())) {
+ 										// replace the null with just the char
+ 										((RestorableJTextField)getEditorComponent()).updateText(""+e.getKeyChar());
+ 								}
+ 						}
+ 				}
+ 
+ 		}
+ 	
+ 		
  		/*
  		 * When user leaves a cell after editing it, the contents of

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

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

Modified Files:
	CellComponentFactory.java 
Log Message:
show newlines in string fields; use cyan bkgnd to show editable in popup only


Index: CellComponentFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CellComponentFactory.java	7 Apr 2004 02:32:57 -0000	1.21
--- CellComponentFactory.java	14 Apr 2004 18:26:46 -0000	1.22
***************
*** 7,10 ****
--- 7,12 ----
  import javax.swing.JTextField;
  import javax.swing.JTextArea;
+ import javax.swing.JLabel;
+ import java.awt.Component;
  import java.sql.Types;
  import java.sql.PreparedStatement;
***************
*** 218,221 ****
--- 220,227 ----
  	
  
+ 	/**
+ 	 * The base component of a DefaultTableCellRenderer is a JLabel.
+ 	 * @author gwg
+ 	 */
  	static private final class CellRenderer extends DefaultTableCellRenderer
  	{
***************
*** 229,235 ****
  		}
  
! 		public void setValue(Object value)
! 		{
  
  			// default behavior if no DataType object is to use the
  			// DefaultColumnRenderer with no modification.
--- 235,284 ----
  		}
  
! 		/**
! 		 *
! 		 * Returns the default table cell renderer - overridden from DefaultTableCellRenderer.
! 		 *
! 		 * @param table  the <code>JTable</code>
! 		 * @param value  the value to assign to the cell at
! 		 *			<code>[row, column]</code>
! 		 * @param isSelected true if cell is selected
! 		 * @param hasFocus true if cell has focus
! 		 * @param row  the row of the cell to render
! 		 * @param column the column of the cell to render
! 		 * @return the default table cell renderer
! 		 */
! 		public Component getTableCellRendererComponent(JTable table, Object value,
! 				boolean isSelected, boolean hasFocus, int row, int column) {
! 				  	
! 				JLabel label = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
  
+ 				// Newlines are stripped from the text by the underlying document, so before
+ 				// actually displaying the text, make sure that the user sees that there are newlines
+ 				// in the text by displaying them as "\n".
+ 				if (label.getText().indexOf('\n') > -1) {
+ 					label.setText(label.getText().replaceAll("\n", "/\\n"));
+ 				}
+ 
+ 				// if text cannot be edited in the cell but can be edited in
+ 				//				the popup, show that by changing the text colors.
+ 				if (_dataTypeObject != null &&
+ 					_dataTypeObject.isEditableInCell(value) == false &&
+ 					_dataTypeObject.isEditableInPopup(value) == true) {
+ 					// Use a CYAN background to indicate that the cell is
+ 					// editable in the popup
+ 				   setBackground(Color.CYAN);
+ 			   }
+ 			   else {
+ 				   // since the previous entry might have changed the color,
+ 				   // we need to reset the color back to default value for table cells.
+ 					setBackground(table.getBackground());
+ 			   }				
+ 
+ 				return label;	  	
+ 		 }
+ 		 
+ 		 
+ 		public void setValue(Object value)
+ 		{		
  			// default behavior if no DataType object is to use the
  			// DefaultColumnRenderer with no modification.

[Squirrel-sql-commits] sql12/doc changes.txt,1.50,1.51

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

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

Modified Files:
	changes.txt 
Log Message:
bug fix: newlines in strings; cyan background and newlines in strings enhance


Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** changes.txt	7 Apr 2004 03:17:50 -0000	1.50
--- changes.txt	14 Apr 2004 18:25:38 -0000	1.51
***************
*** 27,30 ****
--- 27,35 ----
  - BLOBs and CLOBs are now fully editable, as are all of the most common SQL
    types.
+ - Data that can be edited only in the Popup (ie. not in the cell) is now shown
+   with a Cyan background to tell the user that it can be edited, but only in
+   the Popup.
+ - Data containing newlines now shows the newlines explicitly in the in-cell
+   view, i.e. as "\n".
  
  Bug Fixes
***************
*** 36,39 ****
--- 41,47 ----
  - Fix resource strings (Dennis Lundberg).
  - Do a better job of handling MS SQL server catalog names that contain periods.
+ - Strings (VARCHAR and CLOB) fields containing newlines would loose those
+   newlines if edited within the cell.  In-cell editing of that data is now
+   blocked.
  
  Other