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

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

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

Modified Files:
	ResultTab.java SQLResultExecuterPanel.java 
Log Message:
Fixed *ugly* bug in editing SQL results (See change log)

Index: ResultTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ResultTab.java	16 Oct 2005 07:57:01 -0000	1.15
--- ResultTab.java	2 Dec 2005 21:41:01 -0000	1.16
***************
*** 129,147 ****
  		_sqlPanel = sqlPanel;
  		_id = id;
!       _creator = creator;
  
-       _creator.addListener(new DataSetUpdateableTableModelListener()
-       {
-          public void forceEditMode(boolean mode)
-          {
-             onForceEditMode(mode);
-          }
-       });
  
! 		createGUI(exInfo);
  		propertiesHaveChanged(null);
  	}
  
!    /**
  	 * Panel is being added to its parent. Setup any required listeners.
  	 */
--- 129,183 ----
  		_sqlPanel = sqlPanel;
  		_id = id;
! 		reInit(creator, exInfo);
  
  
! 		createGUI();
  		propertiesHaveChanged(null);
  	}
  
! 	public void reInit(IDataSetUpdateableTableModel creator, SQLExecutionInfo exInfo)
! 	{
! 		_creator = creator;
! 		_creator.addListener(new DataSetUpdateableTableModelListener()
! 		{
! 			public void forceEditMode(boolean mode)
! 			{
! 				onForceEditMode(mode);
! 			}
! 		});
! 
! 		_allowEditing = new EditableSqlCheck(exInfo).allowsEditing();
! 
! 		final SessionProperties props = _session.getProperties();
! 
! 		if (_allowEditing)
! 		{
! 			_resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator);
! 
! 		}
! 		else
! 		{
! 			// sql contains columns from multiple tables,
! 			// so we cannot use all of the columns in a WHERE clause
! 			// and it becomes difficult to know which table (or tables!) an
! 			// edited column belongs to.  Therefore limit the output
! 			// to be read-only
! 			_resultSetOutput = BaseDataSetViewerDestination.getInstance(
! 				props.getReadOnlySQLResultsOutputClassName(), null);
! 		}
! 
! 
! 		_resultSetSp.setViewportView(_resultSetOutput.getComponent());
!       _resultSetSp.setRowHeader(null);
! 
!       if (_session.getProperties().getShowResultsMetaData())
!       {
!          _metaDataOutput = BaseDataSetViewerDestination.getInstance(props.getMetaDataOutputClassName(), null);
!          _metaDataSp.setViewportView(_metaDataOutput.getComponent());
!          _metaDataSp.setRowHeader(null);
!       }
! 	}
! 
! 	/**
  	 * Panel is being added to its parent. Setup any required listeners.
  	 */
***************
*** 355,359 ****
  
  
! 	private void createGUI(SQLExecutionInfo exInfo)
  	{
  		//	final Resources rsrc = _session.getApplication().getResources();
--- 391,395 ----
  
  
! 	private void createGUI()
  	{
  		//	final Resources rsrc = _session.getApplication().getResources();
***************
*** 385,416 ****
  		sp.setBorder(BorderFactory.createEmptyBorder());
  		_tp.addTab("Info", sp);
- 
- 		final SessionProperties props = _session.getProperties();
- 
-       _allowEditing = new EditableSqlCheck(exInfo).allowsEditing();
- 
- 		if (_allowEditing) {
- 			_resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator);
- 
- 		}
- 		else {
- 			// sql contains columns from multiple tables,
- 			// so we cannot use all of the columns in a WHERE clause
- 			// and it becomes difficult to know which table (or tables!) an
- 			// edited column belongs to.  Therefore limit the output
- 			// to be read-only
- 			_resultSetOutput = BaseDataSetViewerDestination.getInstance(
- 				props.getReadOnlySQLResultsOutputClassName(), null);
- 		}
- 
-       _resultSetSp.setViewportView(_resultSetOutput.getComponent());
-       _resultSetSp.setRowHeader(null);
- 
-       if (_session.getProperties().getShowResultsMetaData())
-       {
-          _metaDataOutput = BaseDataSetViewerDestination.getInstance(props.getMetaDataOutputClassName(), null);
-          _metaDataSp.setViewportView(_metaDataOutput.getComponent());
-          _metaDataSp.setRowHeader(null);
-       }
  	}
  
--- 421,424 ----

Index: SQLResultExecuterPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SQLResultExecuterPanel.java	24 Jul 2005 20:54:14 -0000	1.19
--- SQLResultExecuterPanel.java	2 Dec 2005 21:41:01 -0000	1.20
***************
*** 642,645 ****
--- 642,646 ----
  			_usedTabs.add(ti);
  			tab = ti._tab;
+ 			tab.reInit(creator, exInfo);
  			s_log.debug("Using tab " + tab.getIdentifier().toString()
  					+ " for results.");
***************
*** 647,652 ****
  		else
  		{
! 			tab = new ResultTab(_session, this, _idFactory.createIdentifier(),
! 									exInfo, creator);
  			ResultTabInfo ti = new ResultTabInfo(tab);
  			_allTabs.put(tab.getIdentifier(), ti);
--- 648,652 ----
  		else
  		{
! 			tab = new ResultTab(_session, this, _idFactory.createIdentifier(), exInfo, creator);
  			ResultTabInfo ti = new ResultTabInfo(tab);
  			_allTabs.put(tab.getIdentifier(), ti);