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

[Squirrel-sql-commits] sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript SQLScriptPlugin.java,1.2,1.3

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

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

Modified Files:
	SQLScriptPlugin.java 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: SQLScriptPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SQLScriptPlugin.java	2 Jan 2003 04:00:40 -0000	1.2
--- SQLScriptPlugin.java	26 Apr 2004 12:49:13 -0000	1.3
***************
*** 89,93 ****
  	 */
  	public String getVersion() {
! 		return "0.21";
  	}
  
--- 89,93 ----
  	 */
  	public String getVersion() {
! 		return "0.22";
  	}
  

[Squirrel-sql-commits] sql12/plugins/sessionscript/doc changes.txt,1.2,1.3

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

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

Modified Files:
	changes.txt 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sessionscript/doc/changes.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** changes.txt	13 Dec 2003 01:12:06 -0000	1.2
--- changes.txt	26 Apr 2004 12:49:11 -0000	1.3
***************
*** 2,13 ****
  ==========
  
! 0.13
  ====
  
  - Updated for SQuirrel SQL Client 1.2beta4.
  
  0.12
  ====
- 
  - Updated for SQuirrel SQL Client 1.1rc1.
  
--- 2,17 ----
  ==========
  
! 0.14
  ====
+ - Updated for SQuirrel SQL Client 1.2beta5.
+ 
  
+ 0.13
+ ====
  - Updated for SQuirrel SQL Client 1.2beta4.
  
+ 
  0.12
  ====
  - Updated for SQuirrel SQL Client 1.1rc1.
  

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

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

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

Modified Files:
	SQLBookmarkPlugin.java 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: SQLBookmarkPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlbookmark/src/net/sourceforge/squirrel_sql/plugins/sqlbookmark/SQLBookmarkPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SQLBookmarkPlugin.java	29 Apr 2003 10:18:40 -0000	1.1
--- SQLBookmarkPlugin.java	26 Apr 2004 12:49:12 -0000	1.2
***************
*** 83,87 ****
       */
      public String getVersion() {
! 	return "0.42";
      }
      
--- 83,87 ----
       */
      public String getVersion() {
! 	return "0.43";
      }
      
***************
*** 128,134 ****
       */
  	public String getLicenceFileName() {
! 	return "license.txt";
      }
  
      /**
       * Return the plugin resources. Used by other classes.
--- 128,147 ----
       */
  	public String getLicenceFileName() {
! 	return "licence.txt";
      }
  
+ 	/**
+ 	 * Returns the name of the change log for the plugin. This should
+ 	 * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
+ 	 * directory.
+ 	 *
+ 	 * @return	the changelog file name or <TT>null</TT> if plugin doesn't have
+ 	 * 			a change log.
+ 	 */
+ 	public String getChangeLogFileName()
+ 	{
+ 		return "changes.txt";
+ 	}
+ 
      /**
       * Return the plugin resources. Used by other classes.

[Squirrel-sql-commits] sql12/plugins/sessionscript/src/net/sourceforge/squirrel_sql/plugins/sessionscript SessionScriptPlugin.java,1.5,1.6

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

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

Modified Files:
	SessionScriptPlugin.java 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: SessionScriptPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sessionscript/src/net/sourceforge/squirrel_sql/plugins/sessionscript/SessionScriptPlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SessionScriptPlugin.java	13 Dec 2003 01:12:06 -0000	1.5
--- SessionScriptPlugin.java	26 Apr 2004 12:49:11 -0000	1.6
***************
*** 78,82 ****
  	public String getVersion()
  	{
! 		return "0.13";
  	}
  
--- 78,82 ----
  	public String getVersion()
  	{
! 		return "0.14";
  	}
  

[Squirrel-sql-commits] sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql MysqlPlugin.java,1.9,1.10

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

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

Modified Files:
	MysqlPlugin.java 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: MysqlPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MysqlPlugin.java	22 Oct 2003 12:31:36 -0000	1.9
--- MysqlPlugin.java	26 Apr 2004 12:49:11 -0000	1.10
***************
*** 109,113 ****
  	public String getVersion()
  	{
! 		return "0.12";
  	}
  
--- 109,113 ----
  	public String getVersion()
  	{
! 		return "0.31";
  	}
  

[Squirrel-sql-commits] sql12/plugins/mysql/doc changes.txt,1.7,1.8

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

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

Modified Files:
	changes.txt 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/doc/changes.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** changes.txt	22 Oct 2003 12:31:36 -0000	1.7
--- changes.txt	26 Apr 2004 12:49:11 -0000	1.8
***************
*** 2,5 ****
--- 2,10 ----
  =======================
  
+ 0.31
+ ====
+ - Updated for SQuirreL 1.2beta5.
+ 
+ 
  0.30
  ====

[Squirrel-sql-commits] sql12/plugins/sqlscript/doc changes.txt,1.1.1.1,1.2

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

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

Modified Files:
	changes.txt 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/doc/changes.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** changes.txt	17 Nov 2002 09:21:42 -0000	1.1.1.1
--- changes.txt	26 Apr 2004 12:49:12 -0000	1.2
***************
*** 2,5 ****
--- 2,13 ----
  ==========
  
+ 0.22
+ ====
+ 
+ Other
+ -----
+ - Updated for changes in SQuirreL 1.2beta5
+ 
+ 
  0.21
  ====

[Squirrel-sql-commits] sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras EditExtrasPlugin.java,1.5,1.6

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

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

Modified Files:
	EditExtrasPlugin.java 
Log Message:
Mods to get 1.2beta5 out the door. Documentation, plugin recompilation etc.

Index: EditExtrasPlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras/EditExtrasPlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EditExtrasPlugin.java	2 Nov 2003 21:03:26 -0000	1.5
--- EditExtrasPlugin.java	26 Apr 2004 12:49:10 -0000	1.6
***************
*** 95,99 ****
  	public String getVersion()
  	{
! 		return "0.11";
  	}
  
--- 95,99 ----
  	public String getVersion()
  	{
! 		return "0.13";
  	}
  

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

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

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

Modified Files:
	changes.txt 
Log Message:
limit cell edit Where clause size


Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** changes.txt	14 Apr 2004 18:25:38 -0000	1.51
--- changes.txt	23 Apr 2004 19:38:31 -0000	1.52
***************
*** 32,35 ****
--- 32,38 ----
  - Data containing newlines now shows the newlines explicitly in the in-cell
    view, i.e. as "\n".
+ - User may identify specific columns to use in WHERE clause when editing
+   cells in table by using the "Limit cell edit WHERE clause size" entry in
+   the Session menu.
  
  Bug Fixes
***************
*** 44,47 ****
--- 47,52 ----
    newlines if edited within the cell.  In-cell editing of that data is now
    blocked.
+ - Tables with many columns should now allow editing by useing the
+   "Limit cell edit WHERE clause size" session tool.
  
  Other

[Squirrel-sql-commits] sql12/doc quick_start.html,1.14,1.15

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

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

Modified Files:
	quick_start.html 
Log Message:
add info on limiting cell edit WHERE clause size


Index: quick_start.html
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/doc/quick_start.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** quick_start.html	14 Apr 2004 18:24:14 -0000	1.14
--- quick_start.html	23 Apr 2004 19:35:19 -0000	1.15
***************
*** 766,775 ****
  
  
! <h3><a name="Limitations"></a>Limitations</h3>
  
! <P>Editing only works for JDBC types of INTEGER, SMALLINT, TINYINT,
! CHAR, VARCHAR, LONGCHAR and JDBC codes -8 and -9. It has not been
! tested with TINYINT, LONGCHAR or types -8 and -9. Other types will be
! included in the future.</P>
  
  <P>Some attempt has been made to validate user input for each of the
--- 766,790 ----
  
  
! <h3><a name="Limitations"></a>Limitations</h3>
! 
! <P>
! Some DBMSs implement "standard" data types in non-standard ways.
! For example, we know that many DBMSs claim to implement the BLOB data type,
! but they actually store that data using a BINARY or LONGVARBINARY field.
! SQuirreL uses the <I>actual</I> data type as defined in the DATA_TYPE field
! in the Columns tab for the table, not the TYPE_NAME.
! Thus it is possible that you may think you are working with one type of data,
! but actually using something else,
! so controls and limitations on specific data types
! (e.g. limiting the data read when loading the Contents tab)
! may not work as expected.
  
! <P>SQuirreL allows editing only on cells that are defined using the
! basic standard SQL data types
! (see <a href="#data_types">Data Types</a>).
! If your DBMS provides other data types, you can create a plug-in that supports them
! (see the file
! net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory for more information).
! </P>
  
  <P>Some attempt has been made to validate user input for each of the
***************
*** 778,790 ****
  so we cannot do a complete validation of user input in all cases. For
  example, we cannot check that a value entered for a SMALLINT field
! will fit into a SMALLINT column in this DBMS. The "validation of last
  resort" is done when we try to do an update on the DB. The DBMS either
  succeeds or it fails, and if there is an error we display that message
  to the user with the information that the DB has not been updated.</P>
  
! <P>VARCHAR fields cannot include tab or newline. VARCHAR fields
  that may be set to null cannot be set to the string value
! "&lt;null&gt; " without the quotes. VARCHAR fields in the database may
! include those values as long as you do not try to edit them.</P>
  
  <A NAME="summary_of_how_it_works"><h3>Summary of How it works (and why
--- 793,823 ----
  so we cannot do a complete validation of user input in all cases. For
  example, we cannot check that a value entered for a SMALLINT field
! will fit into a SMALLINT column in a specific DBMS. Also, the drivers for
! each DBMS provide different amounts of information for the same field type
! in different situation, and SQuirreL cannot validate the input when such data is
! missing.
! The "validation of last
  resort" is done when we try to do an update on the DB. The DBMS either
  succeeds or it fails, and if there is an error we display that message
  to the user with the information that the DB has not been updated.</P>
  
! <P>VARCHAR fields containing tabs or newlines may only be edited in the Popup
! window.
! Fields that can only be edited in the Popup are displayed with a cyan background.
! 
! <P>VARCHAR fields
  that may be set to null cannot be set to the string value
! "&lt;null&gt; " (without the quotes). VARCHAR fields in the database may
! include that value as long as you do not try to edit them.
! 
! </P>
! Tables with a large number of columns or with a column containing a very
! long value (not includeing BLOB/CLOB data types) may get an error when
! trying to update the DB because the WHERE clause is too long.  In this case
! you should open the table in a session, go to the <B>Session</B> menu in the
! main window, and select the entry "Limit cell edit WHERE clause size".
! That tool lets you specify which columns SQuirrel should use in the WHERE clause
! when doing the requested update on the cell contents.
! See <a href=#session_menu>Session Menu</a>.
  
  <A NAME="summary_of_how_it_works"><h3>Summary of How it works (and why
***************
*** 1320,1324 ****
  	<DT><B>Close All SQL Result Windows</B>
  	<DD>Close all SQL results windows &quot;torn off&quot; from the tabbed folder
! 	for the current session.
  </DL>
  
--- 1353,1383 ----
  	<DT><B>Close All SQL Result Windows</B>
  	<DD>Close all SQL results windows &quot;torn off&quot; from the tabbed folder
! 	for the current session.
! 
! 	<DT><B>Limit cell edit WHERE clause size</B>
! 	<DD>This allows you to select specific columns to use as the key fields
! 	when updating the DB after you edit a cell in a table. The purpose of this
! 	is to reduce the size of the WHERE clause, which normally includes all fields
! 	in the table.  For tables with many columns, or with columns containing long
! 	data entries (not includeing BLOB/CLOB fields, which are handled differently),
! 	the automatically generated WHERE clause may exceed the DBMS length limitiation.
! 	<BR> 
! 	You may move column names between the "use columns" and "not use columns" boxes
! 	by selecting the names and using the arrow buttons to move them to the other box.
! 	You must leave at least one column in the "use columns" box, and the columns
! 	in the "use columns" box must be sufficient to uniquely identify each row
! 	in the table, e.g. the primary key fields for the table.
! 	The "Reset" button restores the column name lists to the way they were when
! 	you opened the window.
! 	<BR>
! 	Remember to click "OK" when you are done.
! 	<BR>
! 	If you define a set of columns to use in the WHERE clause and then edit some
! 	other column, SQuirreL will warn you that "1 duplicate row" is about to be
! 	created.  Since you have told SQuirreL to not look at the edited column,
! 	it does not
! 	recognize that the new data is different than the old data so it
! 	gives you a warning.  In this case there is no problem and you should just
! 	tell SQuirreL to go ahead with the update.
  </DL>
  

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

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

Modified Files:
	EditWhereColsSheet.java 
Log Message:
limit cols in edit now functional


Index: EditWhereColsSheet.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/EditWhereColsSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EditWhereColsSheet.java	20 Apr 2004 19:52:53 -0000	1.1
--- EditWhereColsSheet.java	23 Apr 2004 18:34:09 -0000	1.2
***************
*** 27,37 ****
  import java.sql.ResultSet;
  import java.sql.SQLException;
- import java.sql.Types;
- import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
  import java.util.SortedSet;
- import java.util.TreeMap;
  import java.util.TreeSet;
  
--- 27,31 ----
***************
*** 41,51 ****
  import javax.swing.JPanel;
  import javax.swing.JScrollPane;
- import javax.swing.JTabbedPane;
- import javax.swing.event.ChangeEvent;
- import javax.swing.event.ChangeListener;
  
- import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
  import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
- import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
  import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
  import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
--- 35,40 ----
***************
*** 55,59 ****
  
  import net.sourceforge.squirrel_sql.client.gui.BaseSheet;
- import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
  import net.sourceforge.squirrel_sql.client.session.ISession;
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.ContentsTab;
--- 44,47 ----
***************
*** 84,100 ****
  	private IDatabaseObjectInfo _objectInfo;
  
- 	/** A list of panels that make up this sheet. */
- 	private List _panels = new ArrayList();
- 
- 	/** A variable that contains a value that indicates which tab currently has focus. */
- 	private int _tabSelected;
- 
  	/** Frame title. */
  	private JLabel _titleLbl = new JLabel();
  
! 	/** A button used to trigger the clearing of the information. */
! 	private JButton _clearFilter = new JButton();
! 
! 	/** A reference to a panel for the Where Clause list. */
  	private EditWhereColsPanel _editWhereColsPanel = null;
  
--- 72,79 ----
  	private IDatabaseObjectInfo _objectInfo;
  
  	/** Frame title. */
  	private JLabel _titleLbl = new JLabel();
  
! 	/** A reference to a panel for the EditWhereCols list. */
  	private EditWhereColsPanel _editWhereColsPanel = null;
  
***************
*** 137,158 ****
  				final boolean isDebug = s_log.isDebugEnabled();
  				long start = 0;
! 				for (Iterator it = _panels.iterator(); it.hasNext();)
  				{
! 					EditWhereColsPanel pnl = (EditWhereColsPanel)it.next();
! 					if (isDebug)
! 					{
! 						start = System.currentTimeMillis();
! 					}
! 					pnl.initialize(_session);
! 					if (isDebug)
! 					{
! 						s_log.debug(
! 							"Panel "
! 								+ pnl.getTitle()
! 								+ " initialized in "
! 								+ (System.currentTimeMillis() - start)
! 								+ "ms");
! 					}
  				}
  				pack();
  				/*
--- 116,135 ----
  				final boolean isDebug = s_log.isDebugEnabled();
  				long start = 0;
! 
! 				if (isDebug)
  				{
! 					start = System.currentTimeMillis();
  				}
+ 
+ 				if (isDebug)
+ 				{
+ 					s_log.debug(
+ 						"Panel "
+ 						+ _editWhereColsPanel.getTitle()
+ 						+ " initialized in "
+ 						+ (System.currentTimeMillis() - start)
+ 						+ "ms");
+ 				}
+ 
  				pack();
  				/*
***************
*** 209,232 ****
  		return _objectInfo;
  	}
  
  	/**
! 	 * OK button pressed. Edit data and if ok save to aliases model and
  	 * then close dialog.
  	 */
  	private void performOk()
  	{
! 		
! 		//?????????????????????????????????????????
! 
! 		dispose();
  	}
  
  	/**
! 	 * Create the GUI elements for the sheet.
  	 */
  	private void createGUI()
  	{
  		SortedSet columnNames = new TreeSet();
- 		Map textColumns = new TreeMap();
  
  		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
--- 186,218 ----
  		return _objectInfo;
  	}
+ 	
+ 	/**
+ 	 * Reset button pressed.  Reset the data to the way it was when we started
+ 	 * this round of editing.
+ 	 *
+ 	 */
+ 	private void performReset()
+ 	{
+ 		_editWhereColsPanel.reset();
+ 	}
  
  	/**
! 	 * OK button pressed. Save data to EditWhereCols repository
  	 * then close dialog.
  	 */
  	private void performOk()
  	{
! 		// try to save the selection.
! 		// do not dispose of this panel if there is a problem
! 		if (_editWhereColsPanel.ok())
! 			dispose();
  	}
  
  	/**
! 	 * Create the GUI elements for the sheet and pass in the setup data to the panel.
  	 */
  	private void createGUI()
  	{
  		SortedSet columnNames = new TreeSet();
  
  		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
***************
*** 235,239 ****
  		// This is a tool window.
  		GUIUtils.makeToolWindow(this, true);
! /*********************************************************************
  		try
  		{
--- 221,225 ----
  		// This is a tool window.
  		GUIUtils.makeToolWindow(this, true);
! 
  		try
  		{
***************
*** 244,258 ****
  			{
  				columnNames.add(rs.getString("COLUMN_NAME"));
- 				int dataType = rs.getInt("DATA_TYPE");
- 
- 				if ((dataType == Types.CHAR)
- 					|| (dataType == Types.CLOB)
- 					|| (dataType == Types.LONGVARCHAR)
- 					|| (dataType == Types.VARCHAR))
- 				{
- 					textColumns.put(
- 						rs.getString("COLUMN_NAME"),
- 						new Boolean(true));
- 				}
  			}
  		}
--- 230,233 ----
***************
*** 264,289 ****
  
  		_editWhereColsPanel =
! 			new EditWhereColsPanel(columnNames, textColumns, _objectInfo.getQualifiedName());
! 		_panels.add(_editWhereColsPanel);
  
- 		JTabbedPane tabPane = UIFactory.getInstance().createTabbedPane();
- 		for (Iterator it = _panels.iterator(); it.hasNext();)
- 		{
- 			EditWhereColsPanel pnl = (EditWhereColsPanel)it.next();
- 			String pnlTitle = pnl.getTitle();
- 			String hint = pnl.getHint();
- 			final JScrollPane sp = new JScrollPane(pnl.getPanelComponent());
- 			sp.setBorder(BorderFactory.createEmptyBorder());
- 			tabPane.addTab(pnlTitle, null, sp, hint);
- 		}
  
! 		tabPane.addChangeListener(new ChangeListener()
! 		{
! 			public void stateChanged(ChangeEvent event)
! 			{
! 				_clearFilter.setText("Clear ");
! 			}
! 		});
! *******************************************/
  		final JPanel contentPane = new JPanel(new GridBagLayout());
  		contentPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
--- 239,251 ----
  
  		_editWhereColsPanel =
! 			new EditWhereColsPanel(columnNames,  _objectInfo.getQualifiedName(),
! 				ContentsTab.getUnambiguousTableName(_session, _objectInfo.getQualifiedName()));
  
  
! 		String pnlTitle = _editWhereColsPanel.getTitle();
! 		String hint = _editWhereColsPanel.getHint();
! 		final JScrollPane sp = new JScrollPane(_editWhereColsPanel);
! 		sp.setBorder(BorderFactory.createEmptyBorder());
! 
  		final JPanel contentPane = new JPanel(new GridBagLayout());
  		contentPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
***************
*** 303,316 ****
  		gbc.fill = GridBagConstraints.NONE;
  		gbc.gridx = GridBagConstraints.REMAINDER;
! 		_clearFilter.setText("Clear ");
! 		_tabSelected = 0;
! 		_clearFilter.addActionListener(new ActionListener()
! 		{
! 			public void actionPerformed(ActionEvent evt)
! 			{
! 				clearFilter();
! 			}
! 		});
! //??		contentPane.add(_clearFilter);
  
  		gbc.fill = GridBagConstraints.BOTH;
--- 265,287 ----
  		gbc.fill = GridBagConstraints.NONE;
  		gbc.gridx = GridBagConstraints.REMAINDER;
! 		
! 		// leave a blank line just to make it look a bit nicer
! 		gbc.gridx = 0;
! 		++gbc.gridy;
! 		contentPane.add(new JLabel(" "), gbc);
! 		
! 		gbc.gridx = 0;
! 		++gbc.gridy;
! 		contentPane.add(
! 			new JLabel("Limit the size of the WHERE clause used behind the scenes when editing cell contents."), gbc);
! 		gbc.gridx = 0;
! 		++gbc.gridy;
! 		contentPane.add(
! 			new JLabel("The 'use' window should include at least the primary keys for the table."), gbc);
! 
! 		// leave a blank line just to make it look a bit nicer
! 		gbc.gridx = 0;
! 		++gbc.gridy;
! 		contentPane.add(new JLabel(" "), gbc);
  
  		gbc.fill = GridBagConstraints.BOTH;
***************
*** 319,324 ****
  		++gbc.gridy;
  		gbc.weighty = 1;
! //?????		contentPane.add(tabPane, gbc);
! contentPane.add(new JLabel("This panel not yet implemented."), gbc);
  
  		++gbc.gridy;
--- 290,294 ----
  		++gbc.gridy;
  		gbc.weighty = 1;
! 		contentPane.add(_editWhereColsPanel, gbc);
  
  		++gbc.gridy;
***************
*** 329,340 ****
  
  	/**
- 	 * Clear out the SQL Filter information for the appropriate tab.
- 	 */
- 	private void clearFilter()
- 	{
- 		_editWhereColsPanel.clearFilter();
- 	}
- 
- 	/**
  	 * Create a panel that contains the buttons that control the closing
  	 * of the sheet.
--- 299,302 ----
***************
*** 354,357 ****
--- 316,327 ----
  			}
  		});
+ 		JButton resetBtn = new JButton("Reset");
+ 		resetBtn.addActionListener(new ActionListener()
+ 		{
+ 			public void actionPerformed(ActionEvent evt)
+ 			{
+ 				performReset();
+ 			}
+ 		});
  		JButton closeBtn = new JButton("Close");
  		closeBtn.addActionListener(new ActionListener()
***************
*** 364,370 ****
  
  		pnl.add(okBtn);
  		pnl.add(closeBtn);
  
! 		GUIUtils.setJButtonSizesTheSame(new JButton[] { okBtn, closeBtn });
  		getRootPane().setDefaultButton(okBtn);
  
--- 334,341 ----
  
  		pnl.add(okBtn);
+ 		pnl.add(resetBtn);
  		pnl.add(closeBtn);
  
! 		GUIUtils.setJButtonSizesTheSame(new JButton[] { okBtn, resetBtn, closeBtn });
  		getRootPane().setDefaultButton(okBtn);
  

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

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

Modified Files:
	EditWhereColsPanel.java 
Log Message:
limit cols in edit now functional


Index: EditWhereColsPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/EditWhereColsPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EditWhereColsPanel.java	20 Apr 2004 19:50:24 -0000	1.1
--- EditWhereColsPanel.java	23 Apr 2004 18:33:55 -0000	1.2
***************
*** 18,43 ****
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
- import java.awt.Component;
  import java.awt.Dimension;
! import java.awt.GridBagConstraints;
! import java.awt.GridBagLayout;
! import java.awt.Insets;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
- import java.util.Map;
  import java.util.SortedSet;
  
- import javax.swing.BorderFactory;
- import javax.swing.Box;
- import javax.swing.BoxLayout;
  import javax.swing.JButton;
- import javax.swing.JComboBox;
  import javax.swing.JLabel;
  import javax.swing.JPanel;
  import javax.swing.JScrollPane;
! import javax.swing.JTextArea;
! import javax.swing.JTextField;
  
- import net.sourceforge.squirrel_sql.client.session.ISession;
  
  /**
--- 18,38 ----
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  import java.awt.Dimension;
! import java.awt.BorderLayout;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.util.SortedSet;
+ import java.util.TreeSet;
+ import java.util.HashMap;
+ import java.util.Iterator;
  
  import javax.swing.JButton;
  import javax.swing.JLabel;
  import javax.swing.JPanel;
  import javax.swing.JScrollPane;
! import javax.swing.JList;
! import javax.swing.ListModel;
! import javax.swing.JOptionPane;
  
  
  /**
***************
*** 46,53 ****
   * of columns and the WHERE clause generated using all the columns exceeds the DBMS limit.
   */
! public class EditWhereColsPanel
  {
! 	/** The actual GUI panel that allows user to do the maintenance. */
! 	private EditWhereColsSubPanel _myPanel;
  	
  	/**
--- 41,74 ----
   * of columns and the WHERE clause generated using all the columns exceeds the DBMS limit.
   */
! public class EditWhereColsPanel extends JPanel
  {
! 	/** The name of the database table the Where clause applies to. */
! 	private String _tableName;
! 	
! 	/** The name of the table including the URL **/
! 	private String _unambiguousTableName;
! 	
! 	/** The list of all possible columns in the table **/
! 	private SortedSet _columnList;
! 	
! 	/** The list of "to use" column names as seen by the user **/
! 	private JList useColsList;
! 	
! 	/** The list of "to NOT use" column names as seen by the user **/
! 	private JList notUseColsList;
! 	
! 	/** The list of column names to use as calculated when window is created **/
! 	private Object[] initalUseColsArray;
! 	
! 	/** The list of column names to NOT use as calculated when window is created **/
! 	private Object[] initalNotUseColsArray;
! 
! 	/**
! 	 * ?? this should be changed to use the I18N file mechanism.
! 	 */
! 	interface EditWhereColsPanelI18N {
! 		String TITLE = "Limit Columns in Cell Edit";
! 		String HINT = "Limit columns used in WHERE clause when editing table ";
! 	}
  	
  	/**
***************
*** 55,100 ****
  	 *
  	 * @param	columnList	A list of column names for the database table.
- 	 * @param	textColumns	A collection of column names that are "text"
- 	 * 						columns.
  	 * @param	tableName	The name of the database table that the filter
  	 * 						information will apply to.
  	 *
  	 * @throws	IllegalArgumentException
  	 *			The exception thrown if invalid arguments are passed.
  	 */
! 	public EditWhereColsPanel(SortedSet columnList, Map textColumns, 
! 							String tableName)
  		throws IllegalArgumentException
  	{
  		super();
- 		_myPanel = new EditWhereColsSubPanel(columnList, textColumns, tableName);
- 	}
  
! 	/**
! 	 * Initialize the components of the WhereClausePanel.
! 	 *
! 	 * @param	sqlFilterClauses	An instance of a class containing information
! 	 *								about SQL filters already in place for the table.
! 	 *
! 	 * @throws	IllegalArgumentException
! 	 *			Thrown if an invalid argument is passed.
! 	 */
! 	public void initialize(ISession session)
! 		throws IllegalArgumentException
! 	{
! //????????????
! //????		_myPanel.loadData(_sqlFilterClauses);
! 	}
  
! 	/**
! 	 * Returns the panel created by the class.
! 	 *
! 	 * @return Return an instance of a WhereClauseSubPanel.
! 	 */
! 	public Component getPanelComponent()
! 	{
! 		return _myPanel;
  	}
  
  	/**
  	 * Get the title of the panel.
--- 76,128 ----
  	 *
  	 * @param	columnList	A list of column names for the database table.
  	 * @param	tableName	The name of the database table that the filter
  	 * 						information will apply to.
+ 	 * @param unambiguousTableName The name of the table including the URL 
+ 	 * 				to the specific DBMS
  	 *
  	 * @throws	IllegalArgumentException
  	 *			The exception thrown if invalid arguments are passed.
  	 */
! 	public EditWhereColsPanel(SortedSet columnList, 
! 							String tableName, String unambiguousTableName)
  		throws IllegalArgumentException
  	{
  		super();
  
! 		// save the input for use later
! 		_columnList = columnList;
! 		_tableName = tableName;
! 		_unambiguousTableName = unambiguousTableName;
! 		
! 		// look up the table in the EditWhereCols list
! 		HashMap colsTable = EditWhereCols.get(unambiguousTableName);
! 		
! 		if (colsTable == null) {
! 			// use all of the columns
! 			initalUseColsArray = _columnList.toArray();
! 			initalNotUseColsArray = new Object[0];
! 		}
! 		else {
! 			// use just the columns listed in the table, and set the not-used cols to the ones
! 			// that are not mentioned in the table
! 			SortedSet initialUseColsSet = new TreeSet( );
! 			SortedSet initialNotUseColsList = new TreeSet();
! 			
! 			Iterator it = _columnList.iterator();
! 			while (it.hasNext()) {
! 				Object colName = it.next();
! 				if (colsTable.get(colName) != null)
! 					initialUseColsSet.add(colName);
! 				else initialNotUseColsList.add(colName);
! 			}
! 			initalUseColsArray = initialUseColsSet.toArray();
! 			initalNotUseColsArray = initialNotUseColsList.toArray();
! 		}
  
! 		// create all of the gui objects now
! 		createGUI();
  	}
  
+ 
  	/**
  	 * Get the title of the panel.
***************
*** 104,108 ****
  	public String getTitle()
  	{
! 		return EditWhereColsSubPanel.EditWhereColsSubPanelI18n.WHERE_CLAUSE;
  	}
  
--- 132,136 ----
  	public String getTitle()
  	{
! 		return EditWhereColsPanelI18N.TITLE;
  	}
  
***************
*** 114,441 ****
  	public String getHint()
  	{
! 		return EditWhereColsSubPanel.EditWhereColsSubPanelI18n.HINT;
  	}
  
  	/**
! 	 * Update the current session with any changes to the SQL filter
! 	 * information.
  	 */
! 	public void applyChanges()
! 	{
! 		_myPanel.applyChanges();
  	}
! 
  	/**
! 	 * A private class that makes up the bulk of the GUI for the panel.
  	 */
! 	private static final class EditWhereColsSubPanel extends JPanel
! 	{
! 		/**
! 		 * This interface defines locale specific strings. This should be
! 		 * replaced with a property file.
! 		 */
! 		interface EditWhereColsSubPanelI18n
! 		{
! 			String COLUMNS = "Columns";
! 			String OPERATORS = "Operators";
! 			String VALUE = "Value";
! 			String WHERE_CLAUSE = "Where Clause";
! 			String HINT = "Where clause for the selected table";
! 			String ADD = "Add";
! 			String AND = "AND";
! 			String OR = "OR";
! 			String LIKE = "LIKE";
! 			String IN = "IN";
! 			String IS_NULL = "IS NULL";
! 			String IS_NOT_NULL = "IS NOT NULL";
! 		}
! 
! 		/**
! 		 * A JComboBox component containing a list of the names of the
! 		 * columns for the current table.
! 		 */
! 		private JComboBox _columnCombo;
! 
! 		/** A label to identify the column combo box. */
! 		private JLabel _columnLabel = new JLabel(EditWhereColsSubPanelI18n.COLUMNS);
! 
! 		/**
! 		 * A JComboBox containing a list of valid operators used in SQL Where clause
! 		 * expressions.
! 		 */
! 		private OperatorTypeCombo _operatorCombo = new OperatorTypeCombo();
! 
! 		/** A label to identify the operator combo box. */
! 		private JLabel _operatorLabel = new JLabel(EditWhereColsSubPanelI18n.OPERATORS);
! 
! 		/** A field used to enter the right-hand side of a WhereClause expression. */
! 		private JTextField _valueField = new JTextField(10);
! 
! 		/** A label to identify the valueField text area. */
! 		private JLabel _valueLabel = new JLabel(EditWhereColsSubPanelI18n.VALUE);
! 
! 		/** A JComboBox used to list Where clause connectors. */
! 		private AndOrCombo _andOrCombo = new AndOrCombo();
! 
! 		/** A label to identify the andor combo box. */
! 		private JLabel _andOrLabel = new JLabel(" ");
! 
! 		/** A text area used to contain all of the information for the Where clause. */
! 		private JTextArea _whereClauseArea = new JTextArea(10, 40);
! 
! 		/**
! 		 * A button used to add information from the combo boxes and text fields into the
! 		 * Where clause text area.
! 		 */
! 		private JButton _addTextButton = new JButton(EditWhereColsSubPanelI18n.ADD);
! 
! 		/** The name of the database table the Where clause applies to. */
! 		private String _tableName;
! 
! 		/** A List containing the names of the text columns */
! 		private Map _textColumns;
! 
! 		/**
! 		 * A JPanel used for a bulk of the GUI elements of the panel.
! 		 *
! 		 * @param	columnList	A list of the column names for the table.
! 		 * @param	tableName	The name of the database table.
! 		 */
! 		EditWhereColsSubPanel(SortedSet columnList, Map textColumns,
! 								String tableName)
! 		{
! 			super();
! 			_tableName = tableName;
! 			_columnCombo = new JComboBox(columnList.toArray());
! 			_textColumns = textColumns;
! 			createGUI();
! 		}
! 
! 		/**
! 		 * Load existing clause information into the panel.
! 		 *
! 		 * @param	sqlFilterClauses	An instance of a class containing
! 		 * 								SQL Filter information for the current table.
! 		 *
! 		 */
! 		void loadData()
! 		{
! //?????			_whereClauseArea.setText(
! //?????				sqlFilterClauses.get(getClauseIdentifier(), _tableName));
  		}
! 
! 		/** Update the current SQuirreL session with any changes to the SQL filter
! 		 * information.
! 		 * @param sqlFilterClauses An instance of a class containing SQL Filter information for the current table.
! 		 *
! 		 */
! 		void applyChanges()
! 		{
! //????			sqlFilterClauses.put(
! //????				getClauseIdentifier(),
! //????				_tableName,
! //?????				_whereClauseArea.getText());
  		}
  
! 		/**
! 		 * Create the GUI elements for the panel.
! 		 */
! 		private void createGUI()
! 		{
! 			setLayout(new GridBagLayout());
! 			final GridBagConstraints gbc = new GridBagConstraints();
! 			gbc.anchor = GridBagConstraints.WEST;
! 			gbc.fill = GridBagConstraints.HORIZONTAL;
! 
! 			gbc.gridx = 0;
! 			gbc.gridy = 0;
! 			add(createGeneralPanel(), gbc);
  		}
  
! 		/**
! 		 * Create a JPanel with GUI components.
! 		 *
! 		 * @return Returns a JPanel
! 		 */
! 		private JPanel createGeneralPanel()
! 		{
! 			final JPanel pnl = new JPanel(new GridBagLayout());
! 
! 			final GridBagConstraints gbc = new GridBagConstraints();
! 			gbc.anchor = GridBagConstraints.WEST;
! 			gbc.insets = new Insets(4, 4, 4, 4);
! 			gbc.weightx = 1.0;
! 
! 			gbc.fill = GridBagConstraints.NONE;
! 			gbc.gridx = 0;
! 			gbc.gridy = 0;
! 			gbc.gridwidth = 1;
! 			JPanel andOrPanel = new JPanel();
! 			andOrPanel.setLayout(new BoxLayout(andOrPanel, BoxLayout.Y_AXIS));
! 			_andOrLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			andOrPanel.add(_andOrLabel);
! 			_andOrCombo.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			andOrPanel.add(_andOrCombo);
! 			pnl.add(andOrPanel, gbc);
! 
! 			gbc.gridx++;
! 			gbc.gridwidth = 5;
! 			gbc.fill = GridBagConstraints.HORIZONTAL;
! 			JPanel columnPanel = new JPanel();
! 			columnPanel.setLayout(new BoxLayout(columnPanel, BoxLayout.Y_AXIS));
! 			_columnLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			columnPanel.add(_columnLabel);
! 			_columnCombo.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			columnPanel.add(_columnCombo);
! 			pnl.add(columnPanel, gbc);
! 
! 			gbc.gridx += 5;
! 			gbc.gridwidth = 1;
! 			gbc.fill = GridBagConstraints.NONE;
! 			JPanel operatorPanel = new JPanel();
! 			operatorPanel.setLayout(
! 				new BoxLayout(operatorPanel, BoxLayout.Y_AXIS));
! 			_operatorLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			operatorPanel.add(_operatorLabel);
! 			_operatorCombo.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			operatorPanel.add(_operatorCombo);
! 			pnl.add(operatorPanel, gbc);
! 
! 			gbc.gridx++;
! 			gbc.gridwidth = 1;
! 			JPanel valuePanel = new JPanel();
! 			valuePanel.setLayout(new BoxLayout(valuePanel, BoxLayout.Y_AXIS));
! 			_valueLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			valuePanel.add(_valueLabel);
! 			valuePanel.add(Box.createRigidArea(new Dimension(5, 5)));
! 			_valueField.setAlignmentX(Component.LEFT_ALIGNMENT);
! 			valuePanel.add(_valueField);
! 			pnl.add(valuePanel, gbc);
! 
! 			gbc.gridx++;
! 			_addTextButton.addActionListener(new ActionListener()
! 			{
! 				public void actionPerformed(ActionEvent evt)
! 				{
! 					addTextToClause();
! 				}
! 			});
! 			pnl.add(_addTextButton, gbc);
! 
! 			gbc.gridy++; // new line
! 			gbc.gridx = 0;
! 			gbc.gridwidth = 9;
! 			gbc.fill = GridBagConstraints.HORIZONTAL;
! 			gbc.ipady = 4;
! 			_whereClauseArea.setBorder(BorderFactory.createEtchedBorder());
! 			_whereClauseArea.setLineWrap(true);
! 			JScrollPane sp = new JScrollPane(_whereClauseArea, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
! 												JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
! 			pnl.add(sp, gbc);
! 
! 			return pnl;
  		}
  
! 		private static final class OperatorTypeCombo extends JComboBox
! 		{
! 			OperatorTypeCombo()
! 			{
! 				addItem("=");
! 				addItem("<>");
! 				addItem(">");
! 				addItem("<");
! 				addItem(">=");
! 				addItem("<=");
! 				addItem(EditWhereColsSubPanelI18n.IN);
! 				addItem(EditWhereColsSubPanelI18n.LIKE);
! 				addItem(EditWhereColsSubPanelI18n.IS_NULL);
! 				addItem(EditWhereColsSubPanelI18n.IS_NOT_NULL);
! 			}
! 		}
  
! 		private static final class AndOrCombo extends JComboBox
  		{
! 			AndOrCombo()
  			{
! 				addItem(EditWhereColsSubPanelI18n.AND);
! 				addItem(EditWhereColsSubPanelI18n.OR);
  			}
! 		}
! 
! 		/**
! 		 * Combine the information entered in the combo boxes
! 		 * and the text field and add it to the Where clause information.
! 		 */
! 		private void addTextToClause()
  		{
! 			String value = (String)_valueField.getText();
! 			String operator = (String)_operatorCombo.getSelectedItem();
! 			if (((value != null) && (value.length() > 0))
! 					|| ((operator.equals(EditWhereColsSubPanelI18n.IS_NULL))
! 					|| 	(operator.equals(EditWhereColsSubPanelI18n.IS_NOT_NULL))))
  			{
! 				String andOr = (String)_andOrCombo.getSelectedItem();
! 				String column = (String)_columnCombo.getSelectedItem();
! 
! 				// Put the 'AND' or the 'OR' in front of the clause if
! 				// there are already values in the text area.
! 				if (_whereClauseArea.getText().length() > 0)
! 				{
! 					_whereClauseArea.append("\n" + andOr + " ");
! 				}
! 
! 				// If the operator is 'IN' and there are no parenthesis
! 				// around the value, put them there.
! 				if (operator.equals(EditWhereColsSubPanelI18n.IN)
! 					&& (!value.trim().startsWith("(")))
! 				{
! 					value = "(" + value + ")";
! 				}
! 
! 				// If the column is a text column, and there aren't single quotes around the value, put them there.
! 
! 				else if ((value != null) && (value.length() > 0)) 
! 				{
! 					if (_textColumns.containsKey(column)
! 							&& (!value.trim().startsWith("'")))
! 					{
! 						value = "'" + value + "'";
! 					}
! 				}
! 				_whereClauseArea.append(column + " " + operator);
! 
! 				if ((value != null) && (value.length() > 0)) 
! 				{
! 					_whereClauseArea.append(" " + value);
! 				}
  			}
! 			_valueField.setText("");
! 		}
! 
! 		/**
! 		 * Erase all information for the current filter.
! 		 */
! 		public void clearFilter()
! 		{
! //?? currently ignored; this should reset the lists of fields to the original values
! 		}
! 	}
! 
! 	/**
! 	 * Erase any information for the appropriate filter.
! 	 */
! 	public void clearFilter()
! 	{
! 		_myPanel.clearFilter();
! 	}
  
! 	/**
! 	 * Get a value that uniquely identifies this SQL filter clause.
! 	 *
! 	 * @return Return a String value containing an identifing value.
! 	 */
! 	public static String getClauseIdentifier()
! 	{
! 		return EditWhereColsSubPanel.EditWhereColsSubPanelI18n.WHERE_CLAUSE;
  	}
  }
\ No newline at end of file
--- 142,296 ----
  	public String getHint()
  	{
! 		return EditWhereColsPanelI18N.HINT;
  	}
  
  	/**
! 	 * Reset the panel to the contents at the time we started editing
! 	 * (as set in initialize).
! 	 * 
  	 */
! 	public void reset() {	
! 		useColsList.setListData(initalUseColsArray);
! 		notUseColsList.setListData(initalNotUseColsArray);
  	}
! 	
  	/**
! 	 * Put the current data into the EditWhereCols table.
  	 */
! 	public boolean ok() {
! 		
! 		// if all cols are in the "to use" side, delete from EditWhereCols
! 		if (notUseColsList.getModel().getSize() == 0) {
! 			EditWhereCols.put(_unambiguousTableName, null);
  		}
! 		else {
! 			// some cols are not to be used
! 			ListModel useColsModel = useColsList.getModel();
! 			
! 			// do not let user remove everything from the list
! 			if (useColsModel.getSize() == 0) {
! 				JOptionPane.showMessageDialog(this,
! 					"You cannot remove all of the fields from the 'use columns' list.");
! 				return false;
! 			}
! 			
! 			// create the HashMap of names to use and put it in EditWhereCols
! 			HashMap useColsMap = new HashMap(useColsModel.getSize());
! 			
! 			for (int i=0; i< useColsModel.getSize(); i++) {
! 				useColsMap.put(useColsModel.getElementAt(i), useColsModel.getElementAt(i));
! 			}
! 			
! 			EditWhereCols.put(_unambiguousTableName, useColsMap);
  		}
+ 		return true;
+ 	}
+ 	
+ 	/**
+ 	 * Move selected fields from "used" to "not used"
+ 	 */
+ 	private void moveToNotUsed() {
+ 		
+ 		// get the values from the "not use" list and convert to sorted set
+ 		ListModel notUseColsModel = notUseColsList.getModel();
+ 		SortedSet notUseColsSet = new TreeSet();
+ 		for (int i=0; i<notUseColsModel.getSize(); i++)
+ 			notUseColsSet.add(notUseColsModel.getElementAt(i));
+ 		
+ 		// get the values from the "use" list
+ 		ListModel useColsModel = useColsList.getModel();
+ 		
+ 		// create an empty set for the "use" list
+ 		SortedSet useColsSet = new TreeSet();
  
! 		// for each element in the "use" set, if selected then add to "not use",
! 		// otherwise add to new "use" set
! 		for (int i=0; i<useColsModel.getSize(); i++) {
! 			Object colName = useColsModel.getElementAt(i);
! 			if (useColsList.isSelectedIndex(i))
! 				notUseColsSet.add(colName);
! 			else useColsSet.add(colName);
  		}
+ 		
+ 		useColsList.setListData(useColsSet.toArray());
+ 		notUseColsList.setListData(notUseColsSet.toArray());
+ 	}
+ 	
+ 	/**
+ 	 * Move selected fields from "not used" to "used"
+ 	 */
+ 	private void moveToUsed() {
+ 		// get the values from the "use" list and convert to sorted set
+ 		ListModel useColsModel = useColsList.getModel();
+ 		SortedSet useColsSet = new TreeSet();
+ 		for (int i=0; i<useColsModel.getSize(); i++)
+ 			useColsSet.add(useColsModel.getElementAt(i));
+ 		
+ 		// get the values from the "not use" list
+ 		ListModel notUseColsModel = notUseColsList.getModel();
+ 		
+ 		// create an empty set for the "not use" list
+ 		SortedSet notUseColsSet = new TreeSet();
  
! 		// for each element in the "not use" set, if selected then add to "use",
! 		// otherwise add to new "not use" set
! 		for (int i=0; i<notUseColsModel.getSize(); i++) {
! 			Object colName = notUseColsModel.getElementAt(i);
! 			if (notUseColsList.isSelectedIndex(i))
! 				useColsSet.add(colName);
! 			else notUseColsSet.add(colName);
  		}
+ 		
+ 		useColsList.setListData(useColsSet.toArray());
+ 		notUseColsList.setListData(notUseColsSet.toArray());
+ 	}
+ 	
+ 	
+ 	/**
+ 	 * Create the GUI elements for the panel.
+ 	 */
+ 	private void createGUI()
+ 	{
  
! 		JPanel useColsPanel = new JPanel(new BorderLayout());
! 		useColsPanel.add(new JLabel("Use Columns"), BorderLayout.NORTH);
! 		useColsList = new JList(initalUseColsArray);
! 		JScrollPane scrollPane = new JScrollPane(useColsList);
! 		scrollPane.setPreferredSize(new Dimension(200, 200));
! 		useColsPanel.add(scrollPane, BorderLayout.SOUTH);
! 		add(useColsPanel);
  
! 		JPanel moveButtonsPanel = new JPanel();
! 		JPanel buttonPanel = new JPanel(new BorderLayout());
! //????? if desired, get fancy and use icons in buttons instead of text ?????????
! 		JButton moveToNotUsedButton = new JButton("=>");
! 		moveToNotUsedButton.addActionListener(new ActionListener()
  		{
! 			public void actionPerformed(ActionEvent evt)
  			{
! 				moveToNotUsed();
  			}
!  		});
! 		buttonPanel.add(moveToNotUsedButton, BorderLayout.NORTH);
! 		JButton moveToUsedButton = new JButton("<=");
! 		moveToUsedButton.addActionListener(new ActionListener()
  		{
! 			public void actionPerformed(ActionEvent evt)
  			{
! 				moveToUsed();
  			}
! 			});
! 		buttonPanel.add(moveToUsedButton, BorderLayout.SOUTH);
  
! 		moveButtonsPanel.add(buttonPanel, BorderLayout.CENTER);
! 		add(moveButtonsPanel);
! 	  
! 		JPanel notUseColsPanel = new JPanel(new BorderLayout());
! 		notUseColsPanel.add(new JLabel("Not Use Columns"), BorderLayout.NORTH);
! 		notUseColsList = new JList(initalNotUseColsArray);
!  		JScrollPane notUseScrollPane = new JScrollPane(notUseColsList);
! 		notUseScrollPane.setPreferredSize(new Dimension(200, 200));
! 		notUseColsPanel.add(notUseScrollPane, BorderLayout.SOUTH);
! 		add(notUseColsPanel);
  	}
  }
\ No newline at end of file

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

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

Modified Files:
	EditWhereCols.java 
Log Message:
limit cols in edit functional


Index: EditWhereCols.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/EditWhereCols.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EditWhereCols.java	20 Apr 2004 19:45:46 -0000	1.1
--- EditWhereCols.java	23 Apr 2004 18:33:37 -0000	1.2
***************
*** 30,37 ****
  
  public class EditWhereCols {
! 	/**
! 	 * The singleton instance of this object
! 	 */
! 	private static EditWhereCols singleton = null;
  	
  	/**
--- 30,34 ----
  
  public class EditWhereCols {
! 
  	
  	/**
***************
*** 42,46 ****
  	 * 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];
--- 39,45 ----
  	 * 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.
! 	 * This is used in an instance of this class created during load/unload.
  	 */
  	private String[] dataArray = new String[0];
***************
*** 49,84 ****
  	 * 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;
  		
--- 48,69 ----
  	 * The mapping from table name to object (also a HashMap)
  	 * containing the list of names of columns to use in WHERE clause.
+ 	 * There is only one copy of this table for all instances of this class.
  	 */
! 	private static HashMap _tables = new HashMap();
  	
  	/**
! 	 * ctor
  	 */
! 	public EditWhereCols() {}
  	
+ 
  	/**
! 	 * get data in form that can be used to output to file.
! 	 * This is called from an instance of this class.
  	 */
  	public String[] getDataArray() {
  		// first convert internal data into the string array
! 		dataArray = new String[_tables.size()];
! 		Iterator keys = _tables.keySet().iterator();
  		int index = 0;
  		
***************
*** 86,90 ****
  		while (keys.hasNext()) {
  			String tableName = (String)keys.next();
! 			HashMap h = (HashMap)tables.get(tableName);
  			Iterator columnNames = h.keySet().iterator();
  			String outData = tableName + " ";
--- 71,75 ----
  		while (keys.hasNext()) {
  			String tableName = (String)keys.next();
! 			HashMap h = (HashMap)_tables.get(tableName);
  			Iterator columnNames = h.keySet().iterator();
  			String outData = tableName + " ";
***************
*** 106,113 ****
  	 * 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
--- 91,99 ----
  	 * Data in the external form (array of strings) is passed in and must be converted
  	 * to the internal form.
+ 	 * This is called on an instance of this class.
  	 * @param inData array of strings in form "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
***************
*** 128,131 ****
--- 114,126 ----
  				colList.add(inData[i].substring(startIndex, endIndex));
  			}
+ 			
+ 			// create a hashmap containing the column names.
+ 			// by convention, the value and key is the same for each column name
+ 			HashMap h = new HashMap(colList.size());
+ 			for (int j=0; j<colList.size(); j++)
+ 				h.put(colList.get(j), colList.get(j));
+ 				
+ 			// put the map into the tables db with the table name as the key
+ 			_tables.put(tableName, h);
  		}
  	}
***************
*** 135,143 ****
  	 * 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;
  	}
--- 130,138 ----
  	 * If map is null, remove the entry from the tables.
  	 */
! 	public static void put(String tableName, HashMap colNames) {
  		if (colNames == null)
! 			_tables.remove(tableName);
  		else 
! 			_tables.put(tableName, colNames);
  		return;
  	}
***************
*** 147,152 ****
  	 * 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);
  	}
  }
--- 142,147 ----
  	 * it will be null if the table does not have any limitation on the columns to use.
  	 */
! 	public static HashMap get(String tableName) {
! 		return (HashMap)_tables.get(tableName);
  	}
  }

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

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

Modified Files:
	ContentsTab.java 
Log Message:
limit cols in edit functional


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.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ContentsTab.java	20 Apr 2004 19:47:38 -0000	1.24
--- ContentsTab.java	23 Apr 2004 18:31:00 -0000	1.25
***************
*** 124,127 ****
--- 124,139 ----
  	
  	/**
+ 	 * return the name of the table that is unambiguous across DB accesses,
+ 	 * including the same DB on different machines.
+ 	 * This function is static because it is used elsewhere to generate the same
+ 	 * name as is used within instances of this class.
+ 	 * 
+ 	 * @return the name of the table that is unique for this DB access
+ 	 */
+ 	public static String getUnambiguousTableName(ISession session, String name) {
+ 		return session.getAlias().getUrl()+":"+name;
+ 	}
+ 	
+ 	/**
  	 * Get the full name of this table, creating that name the first time we are called
  	 */
***************
*** 130,133 ****
--- 142,149 ----
  			try {
  				final ISession session = getSession();
+ 				final String name = getTableInfo().getQualifiedName();
+ 				fullTableName = getUnambiguousTableName(session, name);
+ /***
+ 				final ISession session = getSession();
  				final ITableInfo ti = getTableInfo();
  				
***************
*** 135,138 ****
--- 151,155 ----
  					ti.getCatalogName()+":"+ti.getSchemaName()+
  					":"+ti.getSimpleName();
+ ****/
  			}
  			catch (Exception e) {
***************
*** 142,145 ****
--- 159,163 ----
  		return fullTableName;
  	}
+ 	
  
  	/**
***************
*** 644,648 ****
  		// 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++) {
--- 662,666 ----
  		// 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.get(getFullTableName()));
  
  		for (int i=0; i< colDefs.length; i++) {

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

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

Modified Files:
	Application.java 
Log Message:
limit cols in edit fully implemented


Index: Application.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/Application.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Application.java	20 Apr 2004 19:46:43 -0000	1.19
--- Application.java	23 Apr 2004 18:29:44 -0000	1.20
***************
*** 584,592 ****
  		indicateNewStartupTask(splash, "Loading Cell Import/Export selections...");
  		loadCellImportExportInfo();
! 		
! //????		
! //????		indicateNewStartupTask(splash, "Loading Edit 'Where' Columns selections...");
! //?????		loadEditWhereColsInfo();
! //???????
  
  		indicateNewStartupTask(splash, "Showing main window...");
--- 584,590 ----
  		indicateNewStartupTask(splash, "Loading Cell Import/Export selections...");
  		loadCellImportExportInfo();
! 				
! 		indicateNewStartupTask(splash, "Loading Edit 'Where' Columns selections...");
! 		loadEditWhereColsInfo();
  
  		indicateNewStartupTask(splash, "Showing main window...");
***************
*** 752,755 ****
--- 750,754 ----
  			{
  				saverInstance = (EditWhereCols)it.next();
+ EditWhereCols x = saverInstance;
  			}
  		}
***************
*** 777,781 ****
  		try
  		{
! 			XMLBeanWriter wtr = new XMLBeanWriter(EditWhereCols.getInstance());
  			wtr.save(new ApplicationFiles().getEditWhereColsFile());
  		}
--- 776,780 ----
  		try
  		{
! 			XMLBeanWriter wtr = new XMLBeanWriter(new EditWhereCols());
  			wtr.save(new ApplicationFiles().getEditWhereColsFile());
  		}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/resources squirrel.properties,1.15,1.16

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

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

Modified Files:
	squirrel.properties 
Log Message:
make menu entry a bit clearer


Index: squirrel.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/resources/squirrel.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** squirrel.properties	20 Apr 2004 19:55:09 -0000	1.15
--- squirrel.properties	22 Apr 2004 20:26:48 -0000	1.16
***************
*** 354,359 ****
  
  # The EditWhereCols function should not be used often enough to warrent an icon
! action.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.name=Limit Edit WHERE Columns
! action.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.tooltip=Limit the columns used by cell editing functions in the 'WHERE' clause
  
  
--- 354,359 ----
  
  # The EditWhereCols function should not be used often enough to warrent an icon
! action.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.name=Limit cell edit WHERE clause size
! action.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.tooltip=Limit the size of DB requests during cell editing by selecting columns for WHERE clause
  
  

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe MainFrameMenuBar.java,1.12,1.13

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

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

Modified Files:
	MainFrameMenuBar.java 
Log Message:
move menu item for limiting Where size in edit to reduce confusion


Index: MainFrameMenuBar.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/MainFrameMenuBar.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MainFrameMenuBar.java	20 Apr 2004 19:53:36 -0000	1.12
--- MainFrameMenuBar.java	22 Apr 2004 20:02:37 -0000	1.13
***************
*** 312,316 ****
  		addToMenu(rsrc, RollbackAction.class, menu);
  		addToMenu(rsrc, SQLFilterAction.class, menu);
- 		addToMenu(rsrc, EditWhereColsAction.class, menu);
  		menu.addSeparator();
  		addToMenu(rsrc, GotoPreviousResultsTabAction.class, menu);
--- 312,315 ----
***************
*** 326,329 ****
--- 325,330 ----
  		addToMenu(rsrc, NextSessionAction.class, menu);
  		menu.addSeparator();
+ 		addToMenu(rsrc, EditWhereColsAction.class, menu);
+ 		menu.addSeparator();
  		menu.setEnabled(false);
  		return menu;

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/resources squirrel.properties,1.14,1.15

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

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

Modified Files:
	squirrel.properties 
Log Message:
hooks for EditWhereCols function


Index: squirrel.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/resources/squirrel.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** squirrel.properties	13 Sep 2003 00:26:39 -0000	1.14
--- squirrel.properties	20 Apr 2004 19:55:09 -0000	1.15
***************
*** 353,356 ****
--- 353,363 ----
  action.net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction.tooltip=Add/remove 'where' and 'order by' clauses for Contents Tab SQL statement
  
+ # The EditWhereCols function should not be used often enough to warrent an icon
+ action.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.name=Limit Edit WHERE Columns
+ action.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.tooltip=Limit the columns used by cell editing functions in the 'WHERE' clause
+ 
+ 
+ 
+ 
  action.net.sourceforge.squirrel_sql.client.session.action.UndoAction.image=
  action.net.sourceforge.squirrel_sql.client.session.action.UndoAction.name=Undo
***************
*** 568,571 ****
--- 575,581 ----
  menuitem.net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction.mnemonic=F
  
+ menuitem.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.accelerator=control shift L
+ menuitem.net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction.mnemonic=L
+ 
  menuitem.net.sourceforge.squirrel_sql.client.session.action.UndoAction.accelerator= control Z
  menuitem.net.sourceforge.squirrel_sql.client.session.action.UndoAction.mnemonic=U

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/action ActionCollection.java,1.14,1.15

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

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

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


Index: ActionCollection.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/action/ActionCollection.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ActionCollection.java	1 Dec 2003 11:32:12 -0000	1.14
--- ActionCollection.java	20 Apr 2004 19:54:14 -0000	1.15
***************
*** 69,72 ****
--- 69,73 ----
  import net.sourceforge.squirrel_sql.client.session.action.RollbackAction;
  import net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction;
+ import net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction;
  import net.sourceforge.squirrel_sql.client.session.action.SessionPropertiesAction;
  import net.sourceforge.squirrel_sql.client.session.action.SetDefaultCatalogAction;
***************
*** 384,387 ****
--- 385,389 ----
  		add(new ShowNativeSQLAction(_app));
  		add(new SQLFilterAction(_app));
+ 		add(new EditWhereColsAction(_app));
  		add(new TileAction(_app));
  		add(new TileHorizontalAction(_app));

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe MainFrameMenuBar.java,1.11,1.12

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

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

Modified Files:
	MainFrameMenuBar.java 
Log Message:
add hooks for EditWhereCols function


Index: MainFrameMenuBar.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/MainFrameMenuBar.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MainFrameMenuBar.java	1 Dec 2003 11:36:03 -0000	1.11
--- MainFrameMenuBar.java	20 Apr 2004 19:53:36 -0000	1.12
***************
*** 78,81 ****
--- 78,82 ----
  import net.sourceforge.squirrel_sql.client.session.action.RollbackAction;
  import net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction;
+ import net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction;
  import net.sourceforge.squirrel_sql.client.session.action.SessionPropertiesAction;
  import net.sourceforge.squirrel_sql.client.session.action.ShowNativeSQLAction;
***************
*** 311,314 ****
--- 312,316 ----
  		addToMenu(rsrc, RollbackAction.class, menu);
  		addToMenu(rsrc, SQLFilterAction.class, menu);
+ 		addToMenu(rsrc, EditWhereColsAction.class, menu);
  		menu.addSeparator();
  		addToMenu(rsrc, GotoPreviousResultsTabAction.class, menu);

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties EditWhereColsSheet.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-serv8964

Added Files:
	EditWhereColsSheet.java 
Log Message:
placeholder for this function


--- NEW FILE: EditWhereColsSheet.java ---
package net.sourceforge.squirrel_sql.client.session.properties;

/**
 * @author gwg
*
 * Adapted from SQLFilterSheet.java by Maury Hammel.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;

import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;

import net.sourceforge.squirrel_sql.client.gui.BaseSheet;
import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.ContentsTab;
/**
 * Edit Where Cols dialog gui.
 *
 */
public class EditWhereColsSheet extends BaseSheet
{
	/**
	 * This interface defines locale specific strings. This should be
	 * replaced with a property file.
	 */
	private interface i18n
	{
		/** Title  */
		String TITLE = "Edit 'WHERE' columns";
	}

	/** Logger for this class. */
	private static final ILogger s_log =
		LoggerController.createLogger(EditWhereColsSheet.class);

	/** A reference to the current SQuirreL session */
	private ISession _session;

	/** A reference to a class containing information about the database metadata. */
	private IDatabaseObjectInfo _objectInfo;

	/** A list of panels that make up this sheet. */
	private List _panels = new ArrayList();

	/** A variable that contains a value that indicates which tab currently has focus. */
	private int _tabSelected;

	/** Frame title. */
	private JLabel _titleLbl = new JLabel();

	/** A button used to trigger the clearing of the information. */
	private JButton _clearFilter = new JButton();

	/** A reference to a panel for the Where Clause list. */
	private EditWhereColsPanel _editWhereColsPanel = null;


	/**
	 * Creates a new instance of SQLFilterSheet
	 *
	 * @param	session		A reference to the current SQuirreL session
	 * @param	objectInfo	An instance of a class containing database metadata
	 * 						information.
	 */
	public EditWhereColsSheet(ISession session, IDatabaseObjectInfo objectInfo)
	{
		super(i18n.TITLE, true);
		if (session == null)
		{
			throw new IllegalArgumentException("Null ISession passed");
		}
		if (objectInfo == null)
		{
			throw new IllegalArgumentException("Null IDatabaseObjectInfo passed");
		}
		_session = session;
		_objectInfo = objectInfo;
		createGUI();
	}

	/**
	 * Position and display the sheet.
	 *
	 * @param	show	A boolean that determines whether the sheet is shown
	 * 					or hidden.
	 */
	public synchronized void setVisible(boolean show)
	{
		if (show)
		{
			if (!isVisible())
			{
				final boolean isDebug = s_log.isDebugEnabled();
				long start = 0;
				for (Iterator it = _panels.iterator(); it.hasNext();)
				{
					EditWhereColsPanel pnl = (EditWhereColsPanel)it.next();
					if (isDebug)
					{
						start = System.currentTimeMillis();
					}
					pnl.initialize(_session);
					if (isDebug)
					{
						s_log.debug(
							"Panel "
								+ pnl.getTitle()
								+ " initialized in "
								+ (System.currentTimeMillis() - start)
								+ "ms");
					}
				}
				pack();
				/*
				 * KLUDGE: For some reason, I am not able to get the sheet to
				 * size correctly. It always displays with a size that causes
				 * the sub-panels to have their scrollbars showing. Add a bit
				 * of an increase in the size of the panel so the scrollbars
				 * are not displayed.
				 */
				Dimension d = getSize();
				d.width += 5;
				d.height += 5;
				setSize(d);
				/*
				 * END-KLUDGE
				 */
				GUIUtils.centerWithinDesktop(this);
			}
			moveToFront();
		}
		super.setVisible(show);
	}

	/**
	 * Set title of this frame. Ensure that the title label matches the frame title.
	 *
	 * @param	title	New title text.
	 */
	public void setTitle(String title)
	{
		_titleLbl.setText(title + ": " + _objectInfo.getSimpleName());
	}

	/**
	 * Dispose of the sheet.
	 */
	private void performClose()
	{
		dispose();
	}

	/**
	 * Get the current SQuirreL session.
	 *
	 * @return	A reference to the current SQuirreL session
	 */
	public ISession getSession()
	{
		return _session;
	}

	public IDatabaseObjectInfo getDatabaseObjectInfo()
	{
		return _objectInfo;
	}

	/**
	 * OK button pressed. Edit data and if ok save to aliases model and
	 * then close dialog.
	 */
	private void performOk()
	{
		
		//?????????????????????????????????????????

		dispose();
	}

	/**
	 * Create the GUI elements for the sheet.
	 */
	private void createGUI()
	{
		SortedSet columnNames = new TreeSet();
		Map textColumns = new TreeMap();

		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
		setTitle(getTitle());

		// This is a tool window.
		GUIUtils.makeToolWindow(this, true);
/*********************************************************************
		try
		{
			SQLConnection sqlConnection = _session.getSQLConnection();
			ResultSet rs =
				sqlConnection.getSQLMetaData().getColumns((ITableInfo)_objectInfo);
			while (rs.next())
			{
				columnNames.add(rs.getString("COLUMN_NAME"));
				int dataType = rs.getInt("DATA_TYPE");

				if ((dataType == Types.CHAR)
					|| (dataType == Types.CLOB)
					|| (dataType == Types.LONGVARCHAR)
					|| (dataType == Types.VARCHAR))
				{
					textColumns.put(
						rs.getString("COLUMN_NAME"),
						new Boolean(true));
				}
			}
		}
		catch (SQLException ex)
		{
			_session.getApplication().showErrorDialog(
				"Unable to get list of columns, " + ex);
		}

		_editWhereColsPanel =
			new EditWhereColsPanel(columnNames, textColumns, _objectInfo.getQualifiedName());
		_panels.add(_editWhereColsPanel);

		JTabbedPane tabPane = UIFactory.getInstance().createTabbedPane();
		for (Iterator it = _panels.iterator(); it.hasNext();)
		{
			EditWhereColsPanel pnl = (EditWhereColsPanel)it.next();
			String pnlTitle = pnl.getTitle();
			String hint = pnl.getHint();
			final JScrollPane sp = new JScrollPane(pnl.getPanelComponent());
			sp.setBorder(BorderFactory.createEmptyBorder());
			tabPane.addTab(pnlTitle, null, sp, hint);
		}

		tabPane.addChangeListener(new ChangeListener()
		{
			public void stateChanged(ChangeEvent event)
			{
				_clearFilter.setText("Clear ");
			}
		});
*******************************************/
		final JPanel contentPane = new JPanel(new GridBagLayout());
		contentPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
		setContentPane(contentPane);

		GridBagConstraints gbc = new GridBagConstraints();

		gbc.gridwidth = 1;

		gbc.gridx = 0;
		gbc.gridy = 0;

		gbc.fill = GridBagConstraints.BOTH;
		gbc.weightx = 1;
		contentPane.add(_titleLbl, gbc);

		gbc.fill = GridBagConstraints.NONE;
		gbc.gridx = GridBagConstraints.REMAINDER;
		_clearFilter.setText("Clear ");
		_tabSelected = 0;
		_clearFilter.addActionListener(new ActionListener()
		{
			public void actionPerformed(ActionEvent evt)
			{
				clearFilter();
			}
		});
//??		contentPane.add(_clearFilter);

		gbc.fill = GridBagConstraints.BOTH;
		gbc.gridwidth = 2;
		gbc.gridx = 0;
		++gbc.gridy;
		gbc.weighty = 1;
//?????		contentPane.add(tabPane, gbc);
contentPane.add(new JLabel("This panel not yet implemented."), gbc);

		++gbc.gridy;
		gbc.gridwidth = 2;
		gbc.weighty = 0;
		contentPane.add(createButtonsPanel(), gbc);
	}

	/**
	 * Clear out the SQL Filter information for the appropriate tab.
	 */
	private void clearFilter()
	{
		_editWhereColsPanel.clearFilter();
	}

	/**
	 * Create a panel that contains the buttons that control the closing
	 * of the sheet.
	 *
	 * @return An instance of a JPanel.
	 */
	private JPanel createButtonsPanel()
	{
		JPanel pnl = new JPanel();

		JButton okBtn = new JButton("OK");
		okBtn.addActionListener(new ActionListener()
		{
			public void actionPerformed(ActionEvent evt)
			{
				performOk();
			}
		});
		JButton closeBtn = new JButton("Close");
		closeBtn.addActionListener(new ActionListener()
		{
			public void actionPerformed(ActionEvent evt)
			{
				performClose();
			}
		});

		pnl.add(okBtn);
		pnl.add(closeBtn);

		GUIUtils.setJButtonSizesTheSame(new JButton[] { okBtn, closeBtn });
		getRootPane().setDefaultButton(okBtn);

		return pnl;
	}


}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session MainPanel.java,1.12,1.13

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

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

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


Index: MainPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/MainPanel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MainPanel.java	1 Dec 2003 12:10:22 -0000	1.12
--- MainPanel.java	20 Apr 2004 19:51:41 -0000	1.13
***************
*** 44,47 ****
--- 44,48 ----
  import net.sourceforge.squirrel_sql.client.session.action.RollbackAction;
  import net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction;
+ import net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction;
  import net.sourceforge.squirrel_sql.client.session.action.ShowNativeSQLAction;
  import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
***************
*** 207,210 ****
--- 208,212 ----
  			actions.get(RefreshObjectTreeAction.class).setEnabled(false);
  			actions.get(SQLFilterAction.class).setEnabled(false);
+ 			actions.get(EditWhereColsAction.class).setEnabled(false);
  		}
  		else
***************
*** 216,219 ****
--- 218,222 ----
  			actions.get(RefreshObjectTreeAction.class).setEnabled(true);
  			actions.get(SQLFilterAction.class).setEnabled(true);
+ 			actions.get(EditWhereColsAction.class).setEnabled(true);
  		}
  		final boolean isAutoCommit = _session.getProperties().getAutoCommit();

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session SessionWindowManager.java,1.3,1.4

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

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

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


Index: SessionWindowManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/SessionWindowManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SessionWindowManager.java	18 Sep 2003 11:38:14 -0000	1.3
--- SessionWindowManager.java	20 Apr 2004 19:51:14 -0000	1.4
***************
*** 30,33 ****
--- 30,34 ----
  import net.sourceforge.squirrel_sql.client.session.properties.SessionPropertiesSheet;
  import net.sourceforge.squirrel_sql.client.session.sqlfilter.SQLFilterSheet;
+ import net.sourceforge.squirrel_sql.client.session.properties.EditWhereColsSheet;
  import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
  import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
***************
*** 59,62 ****
--- 60,64 ----
  
  	private final Map _sqlFilterSheets = new HashMap();
+ 	private final Map _editWhereColsSheets = new HashMap();
  
  	/** Listens to session properties dialogs waiting for them to close. */
***************
*** 66,69 ****
--- 68,74 ----
  	private final SQLFilterDialogListener _sqlFilterDialogListener = new SQLFilterDialogListener();
  
+ 	/** Listens to SQL filter dialogs waiting for them to close. */
+ 	private final EditWhereColsDialogListener _editWhereColsDialogListener = new EditWhereColsDialogListener();
+ 
  	/** Listenys to Session internal frames waiting for them to close. */
  	private final SessionInternalFrameListener _sessionInternalFrameListener = new SessionInternalFrameListener();
***************
*** 225,228 ****
--- 230,272 ----
  
  	/**
+ 	 * Get a EditWhereCols sheet for the passed session. If one already exists it
+ 	 * will be brought to the front. If one doesn't exist it will be created.
+ 	 *
+ 	 * @param	session		The session for which the user has requested the sheet.
+ 	 * @param	objectInfo	An instance of a class containing information about
+ 	 * 						the database metadata.
+ 	 *
+ 	 * @return	The maintenance sheet for the passed session.
+ 	 */
+ 	public synchronized EditWhereColsSheet showEditWhereColsDialog(ISession session,
+ 											IDatabaseObjectInfo objectInfo)
+ 	{
+ 		if (session == null)
+ 		{
+ 			throw new IllegalArgumentException("ISession == null");
+ 		}
+ 		if (objectInfo == null)
+ 		{
+ 			throw new IllegalArgumentException("IDatabaseObjectInfo == null");
+ 		}
+ 
+ 		EditWhereColsSheet editWhereColsSheet = getEditWhereColsSheet(session, objectInfo);
+ 		if (editWhereColsSheet == null)
+ 		{
+ 			editWhereColsSheet = new EditWhereColsSheet(session, objectInfo);
+ 			Map map = getAllEditWhereColsSheets(session);
+ 			map.put(objectInfo.getQualifiedName(), editWhereColsSheet);
+ 			_app.getMainFrame().addInternalFrame(editWhereColsSheet, true, null);
+ 			editWhereColsSheet.addInternalFrameListener(_editWhereColsDialogListener);
+ 			positionSheet(editWhereColsSheet);
+ 		}
+ 
+ 		editWhereColsSheet.moveToFront();
+ 		editWhereColsSheet.setVisible(true);
+ 		return editWhereColsSheet;
+ 	}
+ 
+ 
+ 	/**
  	 * Close all sessions.
  	 */
***************
*** 280,283 ****
--- 324,344 ----
  		return map;
  	}
+ 	
+ 	private EditWhereColsSheet getEditWhereColsSheet(ISession session, IDatabaseObjectInfo objectInfo)
+ 	{
+ 		Map map = getAllEditWhereColsSheets(session);
+ 		return (EditWhereColsSheet)map.get(objectInfo.getQualifiedName());
+ 	}
+ 
+ 	private Map getAllEditWhereColsSheets(ISession session)
+ 	{
+ 		Map map = (Map)_editWhereColsSheets.get(session.getIdentifier());
+ 		if (map == null)
+ 		{
+ 			map = new HashMap();
+ 			_editWhereColsSheets.put(session.getIdentifier(), map);
+ 		}
+ 		return map;
+ 	}
  
  	private void positionSheet(JInternalFrame jif)
***************
*** 321,324 ****
--- 382,399 ----
  		}
  	}
+ 	
+ 	private synchronized void editWhereColsDialogClosed(EditWhereColsSheet sfs)
+ 	{
+ 		if (sfs != null)
+ 		{
+ 			sfs.removeInternalFrameListener(_editWhereColsDialogListener);
+ 			Map map = getAllEditWhereColsSheets(sfs.getSession());
+ 			String key = sfs.getDatabaseObjectInfo().getQualifiedName();
+ 			if (map.remove(key) == null)
+ 			{
+ 				s_log.error("Unable to find EditWhereColsSheet for " + key);
+ 			}
+ 		}
+ 	}
  
  	private synchronized void sessionInternalFrameClosed(SessionInternalFrame sif)
***************
*** 356,359 ****
--- 431,443 ----
  		}
  	}
+ 	
+ 	private final class EditWhereColsDialogListener extends InternalFrameAdapter
+ 	{
+ 		public void internalFrameClosed(InternalFrameEvent evt)
+ 		{
+ 			EditWhereColsSheet sfs = (EditWhereColsSheet)evt.getInternalFrame();
+ 			SessionWindowManager.this.editWhereColsDialogClosed(sfs);
+ 		}
+ 	}
  
  	private final class SessionInternalFrameListener extends InternalFrameAdapter

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties EditWhereColsPanel.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-serv8212

Added Files:
	EditWhereColsPanel.java 
Log Message:
placeholder for the panel - work TBD for real


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

import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.JTextField;

import net.sourceforge.squirrel_sql.client.session.ISession;

/**
 * This panel allows the user to select specific columns from a specific table for use in
 * the WHERE clause when editing a cell in a table.  This is useful if the table has a large number
 * of columns and the WHERE clause generated using all the columns exceeds the DBMS limit.
 */
public class EditWhereColsPanel
{
	/** The actual GUI panel that allows user to do the maintenance. */
	private EditWhereColsSubPanel _myPanel;
	
	/**
	 * Create a new instance of a WhereClausePanel.
	 *
	 * @param	columnList	A list of column names for the database table.
	 * @param	textColumns	A collection of column names that are "text"
	 * 						columns.
	 * @param	tableName	The name of the database table that the filter
	 * 						information will apply to.
	 *
	 * @throws	IllegalArgumentException
	 *			The exception thrown if invalid arguments are passed.
	 */
	public EditWhereColsPanel(SortedSet columnList, Map textColumns, 
							String tableName)
		throws IllegalArgumentException
	{
		super();
		_myPanel = new EditWhereColsSubPanel(columnList, textColumns, tableName);
	}

	/**
	 * Initialize the components of the WhereClausePanel.
	 *
	 * @param	sqlFilterClauses	An instance of a class containing information
	 *								about SQL filters already in place for the table.
	 *
	 * @throws	IllegalArgumentException
	 *			Thrown if an invalid argument is passed.
	 */
	public void initialize(ISession session)
		throws IllegalArgumentException
	{
//????????????
//????		_myPanel.loadData(_sqlFilterClauses);
	}

	/**
	 * Returns the panel created by the class.
	 *
	 * @return Return an instance of a WhereClauseSubPanel.
	 */
	public Component getPanelComponent()
	{
		return _myPanel;
	}

	/**
	 * Get the title of the panel.
	 *
	 * @return	Return a string containing the title of the panl.
	 */
	public String getTitle()
	{
		return EditWhereColsSubPanel.EditWhereColsSubPanelI18n.WHERE_CLAUSE;
	}

	/**
	 * Get the hint text associated with the panel.
	 *
	 * @return A String value containing the hint text associated with the panel.
	 */
	public String getHint()
	{
		return EditWhereColsSubPanel.EditWhereColsSubPanelI18n.HINT;
	}

	/**
	 * Update the current session with any changes to the SQL filter
	 * information.
	 */
	public void applyChanges()
	{
		_myPanel.applyChanges();
	}

	/**
	 * A private class that makes up the bulk of the GUI for the panel.
	 */
	private static final class EditWhereColsSubPanel extends JPanel
	{
		/**
		 * This interface defines locale specific strings. This should be
		 * replaced with a property file.
		 */
		interface EditWhereColsSubPanelI18n
		{
			String COLUMNS = "Columns";
			String OPERATORS = "Operators";
			String VALUE = "Value";
			String WHERE_CLAUSE = "Where Clause";
			String HINT = "Where clause for the selected table";
			String ADD = "Add";
			String AND = "AND";
			String OR = "OR";
			String LIKE = "LIKE";
			String IN = "IN";
			String IS_NULL = "IS NULL";
			String IS_NOT_NULL = "IS NOT NULL";
		}

		/**
		 * A JComboBox component containing a list of the names of the
		 * columns for the current table.
		 */
		private JComboBox _columnCombo;

		/** A label to identify the column combo box. */
		private JLabel _columnLabel = new JLabel(EditWhereColsSubPanelI18n.COLUMNS);

		/**
		 * A JComboBox containing a list of valid operators used in SQL Where clause
		 * expressions.
		 */
		private OperatorTypeCombo _operatorCombo = new OperatorTypeCombo();

		/** A label to identify the operator combo box. */
		private JLabel _operatorLabel = new JLabel(EditWhereColsSubPanelI18n.OPERATORS);

		/** A field used to enter the right-hand side of a WhereClause expression. */
		private JTextField _valueField = new JTextField(10);

		/** A label to identify the valueField text area. */
		private JLabel _valueLabel = new JLabel(EditWhereColsSubPanelI18n.VALUE);

		/** A JComboBox used to list Where clause connectors. */
		private AndOrCombo _andOrCombo = new AndOrCombo();

		/** A label to identify the andor combo box. */
		private JLabel _andOrLabel = new JLabel(" ");

		/** A text area used to contain all of the information for the Where clause. */
		private JTextArea _whereClauseArea = new JTextArea(10, 40);

		/**
		 * A button used to add information from the combo boxes and text fields into the
		 * Where clause text area.
		 */
		private JButton _addTextButton = new JButton(EditWhereColsSubPanelI18n.ADD);

		/** The name of the database table the Where clause applies to. */
		private String _tableName;

		/** A List containing the names of the text columns */
		private Map _textColumns;

		/**
		 * A JPanel used for a bulk of the GUI elements of the panel.
		 *
		 * @param	columnList	A list of the column names for the table.
		 * @param	tableName	The name of the database table.
		 */
		EditWhereColsSubPanel(SortedSet columnList, Map textColumns,
								String tableName)
		{
			super();
			_tableName = tableName;
			_columnCombo = new JComboBox(columnList.toArray());
			_textColumns = textColumns;
			createGUI();
		}

		/**
		 * Load existing clause information into the panel.
		 *
		 * @param	sqlFilterClauses	An instance of a class containing
		 * 								SQL Filter information for the current table.
		 *
		 */
		void loadData()
		{
//?????			_whereClauseArea.setText(
//?????				sqlFilterClauses.get(getClauseIdentifier(), _tableName));
		}

		/** Update the current SQuirreL session with any changes to the SQL filter
		 * information.
		 * @param sqlFilterClauses An instance of a class containing SQL Filter information for the current table.
		 *
		 */
		void applyChanges()
		{
//????			sqlFilterClauses.put(
//????				getClauseIdentifier(),
//????				_tableName,
//?????				_whereClauseArea.getText());
		}

		/**
		 * Create the GUI elements for the panel.
		 */
		private void createGUI()
		{
			setLayout(new GridBagLayout());
			final GridBagConstraints gbc = new GridBagConstraints();
			gbc.anchor = GridBagConstraints.WEST;
			gbc.fill = GridBagConstraints.HORIZONTAL;

			gbc.gridx = 0;
			gbc.gridy = 0;
			add(createGeneralPanel(), gbc);
		}

		/**
		 * Create a JPanel with GUI components.
		 *
		 * @return Returns a JPanel
		 */
		private JPanel createGeneralPanel()
		{
			final JPanel pnl = new JPanel(new GridBagLayout());

			final GridBagConstraints gbc = new GridBagConstraints();
			gbc.anchor = GridBagConstraints.WEST;
			gbc.insets = new Insets(4, 4, 4, 4);
			gbc.weightx = 1.0;

			gbc.fill = GridBagConstraints.NONE;
			gbc.gridx = 0;
			gbc.gridy = 0;
			gbc.gridwidth = 1;
			JPanel andOrPanel = new JPanel();
			andOrPanel.setLayout(new BoxLayout(andOrPanel, BoxLayout.Y_AXIS));
			_andOrLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
			andOrPanel.add(_andOrLabel);
			_andOrCombo.setAlignmentX(Component.LEFT_ALIGNMENT);
			andOrPanel.add(_andOrCombo);
			pnl.add(andOrPanel, gbc);

			gbc.gridx++;
			gbc.gridwidth = 5;
			gbc.fill = GridBagConstraints.HORIZONTAL;
			JPanel columnPanel = new JPanel();
			columnPanel.setLayout(new BoxLayout(columnPanel, BoxLayout.Y_AXIS));
			_columnLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
			columnPanel.add(_columnLabel);
			_columnCombo.setAlignmentX(Component.LEFT_ALIGNMENT);
			columnPanel.add(_columnCombo);
			pnl.add(columnPanel, gbc);

			gbc.gridx += 5;
			gbc.gridwidth = 1;
			gbc.fill = GridBagConstraints.NONE;
			JPanel operatorPanel = new JPanel();
			operatorPanel.setLayout(
				new BoxLayout(operatorPanel, BoxLayout.Y_AXIS));
			_operatorLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
			operatorPanel.add(_operatorLabel);
			_operatorCombo.setAlignmentX(Component.LEFT_ALIGNMENT);
			operatorPanel.add(_operatorCombo);
			pnl.add(operatorPanel, gbc);

			gbc.gridx++;
			gbc.gridwidth = 1;
			JPanel valuePanel = new JPanel();
			valuePanel.setLayout(new BoxLayout(valuePanel, BoxLayout.Y_AXIS));
			_valueLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
			valuePanel.add(_valueLabel);
			valuePanel.add(Box.createRigidArea(new Dimension(5, 5)));
			_valueField.setAlignmentX(Component.LEFT_ALIGNMENT);
			valuePanel.add(_valueField);
			pnl.add(valuePanel, gbc);

			gbc.gridx++;
			_addTextButton.addActionListener(new ActionListener()
			{
				public void actionPerformed(ActionEvent evt)
				{
					addTextToClause();
				}
			});
			pnl.add(_addTextButton, gbc);

			gbc.gridy++; // new line
			gbc.gridx = 0;
			gbc.gridwidth = 9;
			gbc.fill = GridBagConstraints.HORIZONTAL;
			gbc.ipady = 4;
			_whereClauseArea.setBorder(BorderFactory.createEtchedBorder());
			_whereClauseArea.setLineWrap(true);
			JScrollPane sp = new JScrollPane(_whereClauseArea, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
												JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
			pnl.add(sp, gbc);

			return pnl;
		}

		private static final class OperatorTypeCombo extends JComboBox
		{
			OperatorTypeCombo()
			{
				addItem("=");
				addItem("<>");
				addItem(">");
				addItem("<");
				addItem(">=");
				addItem("<=");
				addItem(EditWhereColsSubPanelI18n.IN);
				addItem(EditWhereColsSubPanelI18n.LIKE);
				addItem(EditWhereColsSubPanelI18n.IS_NULL);
				addItem(EditWhereColsSubPanelI18n.IS_NOT_NULL);
			}
		}

		private static final class AndOrCombo extends JComboBox
		{
			AndOrCombo()
			{
				addItem(EditWhereColsSubPanelI18n.AND);
				addItem(EditWhereColsSubPanelI18n.OR);
			}
		}

		/**
		 * Combine the information entered in the combo boxes
		 * and the text field and add it to the Where clause information.
		 */
		private void addTextToClause()
		{
			String value = (String)_valueField.getText();
			String operator = (String)_operatorCombo.getSelectedItem();
			if (((value != null) && (value.length() > 0))
					|| ((operator.equals(EditWhereColsSubPanelI18n.IS_NULL))
					|| 	(operator.equals(EditWhereColsSubPanelI18n.IS_NOT_NULL))))
			{
				String andOr = (String)_andOrCombo.getSelectedItem();
				String column = (String)_columnCombo.getSelectedItem();

				// Put the 'AND' or the 'OR' in front of the clause if
				// there are already values in the text area.
				if (_whereClauseArea.getText().length() > 0)
				{
					_whereClauseArea.append("\n" + andOr + " ");
				}

				// If the operator is 'IN' and there are no parenthesis
				// around the value, put them there.
				if (operator.equals(EditWhereColsSubPanelI18n.IN)
					&& (!value.trim().startsWith("(")))
				{
					value = "(" + value + ")";
				}

				// If the column is a text column, and there aren't single quotes around the value, put them there.

				else if ((value != null) && (value.length() > 0)) 
				{
					if (_textColumns.containsKey(column)
							&& (!value.trim().startsWith("'")))
					{
						value = "'" + value + "'";
					}
				}
				_whereClauseArea.append(column + " " + operator);

				if ((value != null) && (value.length() > 0)) 
				{
					_whereClauseArea.append(" " + value);
				}
			}
			_valueField.setText("");
		}

		/**
		 * Erase all information for the current filter.
		 */
		public void clearFilter()
		{
//?? currently ignored; this should reset the lists of fields to the original values
		}
	}

	/**
	 * Erase any information for the appropriate filter.
	 */
	public void clearFilter()
	{
		_myPanel.clearFilter();
	}

	/**
	 * Get a value that uniquely identifies this SQL filter clause.
	 *
	 * @return Return a String value containing an identifing value.
	 */
	public static String getClauseIdentifier()
	{
		return EditWhereColsSubPanel.EditWhereColsSubPanelI18n.WHERE_CLAUSE;
	}
}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/action EditWhereColsCommand.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-serv8019

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


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

import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SessionWindowManager;
/**
 * This <CODE>ICommand</CODE> displays a dialog box that allows the user to
 * enter a 'where' clause or an 'order by' clause used when getting data via
 * the 'Contents' tab.
 *
 * @author <A HREF="mailto:mjh...@us...">Maury Hammel</A>
 */
public class EditWhereColsCommand implements ICommand
{
	/** The session identifying the table for us to limit the columns. */
	private final ISession _session;
	
	/** A variable to contain a reference to the list of database objects and
	 * information about them.
	 */
	private final IDatabaseObjectInfo _objectInfo;

	/** Creates a new instance of SQLFilterCommand
	* @param session A variable to contain a reference to the current SQuirreL session instance.
	*
	* @param objectInfo A variable to contain a reference to the list of data objects and information
	* aobut them.
	*
	*/
	public EditWhereColsCommand(ISession session, IDatabaseObjectInfo objectInfo)
	{
		super();
		if (session == null)
		{
			throw new IllegalArgumentException("Null ISession passed");
		}
		if (objectInfo == null)
		{
			throw new IllegalArgumentException("Null IDatabaseObjectInfo passed");
		}
		_session = session;
		_objectInfo = objectInfo;
	}

	/**
	 * Display the SQL Filter dialog.
	 */
	public void execute()
	{
		if (_session != null)
		{
			SessionWindowManager winMgr =
				_session.getApplication().getSessionWindowManager();
			winMgr.showEditWhereColsDialog(_session, _objectInfo);
		}
	}
}