|
From: <ger...@us...> - 2012-12-29 11:30:09
|
Revision: 6725
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6725&view=rev
Author: gerdwagner
Date: 2012-12-29 11:30:01 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Fixed Bug concerning "Read On" and table find
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ContinueReadHandler.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-12-23 00:21:12 UTC (rev 6724)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-12-29 11:30:01 UTC (rev 6725)
@@ -63,12 +63,12 @@
private SQLExecutionInfo _exInfo;
/** Panel displaying the SQL results. */
- private DataSetViewerFindDecorator _resultSetOutput;
+ private DataSetViewerFindDecorator _dataSetViewerFindDecorator;
/** Panel displaying the SQL results meta data. */
private IDataSetViewer _metaDataOutput;
- /** Scroll pane for <TT>_resultSetOutput</TT>. */
+ /** Scroll pane for <TT>_dataSetViewerFindDecorator</TT>. */
// SCROLL
// private JScrollPane _resultSetSp = new JScrollPane();
@@ -175,7 +175,7 @@
if (_allowEditing)
{
IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator, new DefaultDataModelImplementationDetails(_session));
- _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
+ _dataSetViewerFindDecorator = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
}
else
@@ -188,12 +188,12 @@
IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(
props.getReadOnlySQLResultsOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
- _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
+ _dataSetViewerFindDecorator = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
}
// SCROLL
- // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
+ // _resultSetSp.setViewportView(_dataSetViewerFindDecorator.getComponent());
// _resultSetSp.setRowHeader(null);
if (_session.getProperties().getShowResultsMetaData())
@@ -250,8 +250,8 @@
_rsds = rsds;
// Display the result set.
- _resultSetOutput.getDataSetViewer().show(rsds, null);
- initContinueReadChannel(_resultSetOutput);
+ _dataSetViewerFindDecorator.getDataSetViewer().show(rsds, null);
+ initContinueReadChannel(_dataSetViewerFindDecorator);
final int rowCount = _rsds.currentRowCount();
@@ -316,9 +316,10 @@
try
{
- TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
- _resultSetOutput.getDataSetViewer().show(_rsds, null);
- restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
+ TableState resultSortableTableState = getTableState(_dataSetViewerFindDecorator.getDataSetViewer());
+ _dataSetViewerFindDecorator.getDataSetViewer().show(_rsds, null);
+ restoreTableState(resultSortableTableState, _dataSetViewerFindDecorator.getDataSetViewer());
+ _dataSetViewerFindDecorator.resetFind();
_currentSqlLblCtrl.reInit(_rsds.currentRowCount(), _rsds.areAllPossibleResultsOfSQLRead());
_queryInfoPanel.displayRowCount(_rsds.currentRowCount());
@@ -384,9 +385,9 @@
{
_metaDataOutput.clear();
}
- if (_resultSetOutput != null)
+ if (_dataSetViewerFindDecorator != null)
{
- _resultSetOutput.getDataSetViewer().clear();
+ _dataSetViewerFindDecorator.getDataSetViewer().clear();
}
_exInfo = null;
_currentSqlLblCtrl.clear();
@@ -447,18 +448,18 @@
{
if (_allowEditing)
{
- TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
+ TableState resultSortableTableState = getTableState(_dataSetViewerFindDecorator.getDataSetViewer());
IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator, new DefaultDataModelImplementationDetails(_session));
- // _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer);
- _resultSetOutput.replaceDataSetViewer(dataSetViewer);
+ // _dataSetViewerFindDecorator = new DataSetViewerFindDecorator(dataSetViewer);
+ _dataSetViewerFindDecorator.replaceDataSetViewer(dataSetViewer);
_rsds.resetCursor();
- _resultSetOutput.getDataSetViewer().show(_rsds, null);
- initContinueReadChannel(_resultSetOutput);
+ _dataSetViewerFindDecorator.getDataSetViewer().show(_rsds, null);
+ initContinueReadChannel(_dataSetViewerFindDecorator);
- restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
+ restoreTableState(resultSortableTableState, _dataSetViewerFindDecorator.getDataSetViewer());
}
else
{
@@ -473,17 +474,17 @@
String readOnlyOutput = props.getReadOnlySQLResultsOutputClassName();
- TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
+ TableState resultSortableTableState = getTableState(_dataSetViewerFindDecorator.getDataSetViewer());
IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator, new DefaultDataModelImplementationDetails(_session));
- _resultSetOutput.replaceDataSetViewer(dataSetViewer);
+ _dataSetViewerFindDecorator.replaceDataSetViewer(dataSetViewer);
_rsds.resetCursor();
- _resultSetOutput.getDataSetViewer().show(_rsds, null);
- initContinueReadChannel(_resultSetOutput);
+ _dataSetViewerFindDecorator.getDataSetViewer().show(_rsds, null);
+ initContinueReadChannel(_dataSetViewerFindDecorator);
- restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
+ restoreTableState(resultSortableTableState, _dataSetViewerFindDecorator.getDataSetViewer());
}
}
catch (DataSetException e)
@@ -539,7 +540,7 @@
// i18n[ResultTab.resultsTabTitle=Results]
String resultsTabTitle =
s_stringMgr.getString("ResultTab.resultsTabTitle");
- _tabResultTabs.addTab(resultsTabTitle, _resultSetOutput.getComponent()); // SCROLL
+ _tabResultTabs.addTab(resultsTabTitle, _dataSetViewerFindDecorator.getComponent()); // SCROLL
if (_session.getProperties().getShowResultsMetaData())
{
@@ -646,7 +647,7 @@
public void toggleShowFindPanel()
{
_tabResultTabs.setSelectedIndex(0);
- if(false == _resultSetOutput.toggleShowFindPanel())
+ if(false == _dataSetViewerFindDecorator.toggleShowFindPanel())
{
_session.getApplication().getMessageHandler().showWarningMessage(s_stringMgr.getString("ResultTab.tableSearchNotSupported"));
s_log.warn(s_stringMgr.getString("ResultTab.tableSearchNotSupported"));
@@ -665,12 +666,12 @@
@Override
public TableState getResultSortableTableState()
{
- return _resultSetOutput.getDataSetViewer().getResultSortableTableState();
+ return _dataSetViewerFindDecorator.getDataSetViewer().getResultSortableTableState();
}
public void applyResultSortableTableState(TableState sortableTableState)
{
- _resultSetOutput.getDataSetViewer().applyResultSortableTableState(sortableTableState);
+ _dataSetViewerFindDecorator.getDataSetViewer().applyResultSortableTableState(sortableTableState);
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ContinueReadHandler.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ContinueReadHandler.java 2012-12-23 00:21:12 UTC (rev 6724)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ContinueReadHandler.java 2012-12-29 11:30:01 UTC (rev 6725)
@@ -98,10 +98,10 @@
scrollPane.getVerticalScrollBar().removeAdjustmentListener(_adjustmentListener);
}
- if(null != _continueReadChannel)
- {
- _continueReadChannel.closeStatementAndResultSet();
-
- }
+// if(null != _continueReadChannel)
+// {
+// _continueReadChannel.closeStatementAndResultSet();
+//
+// }
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-12-23 00:21:12 UTC (rev 6724)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-12-29 11:30:01 UTC (rev 6725)
@@ -384,6 +384,11 @@
public void setDataSetViewerTablePanel(DataSetViewerTablePanel dataSetViewerTablePanel)
{
_dataSetViewerTablePanel = dataSetViewerTablePanel;
+ reset();
+ }
+
+ public void reset()
+ {
_findService = null;
_trace.clear();
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java 2012-12-23 00:21:12 UTC (rev 6724)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java 2012-12-29 11:30:01 UTC (rev 6725)
@@ -140,6 +140,11 @@
}
}
+ public void resetFind()
+ {
+ _dataSetFindPanelController.reset();
+ }
+
private static class NullPanel extends JPanel
{
private NullPanel()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
