You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ger...@us...> - 2013-01-22 22:02:06
|
Revision: 6737
http://sourceforge.net/p/squirrel-sql/code/6737
Author: gerdwagner
Date: 2013-01-22 22:02:02 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
typos
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2013-01-22 21:57:00 UTC (rev 6736)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2013-01-22 22:02:02 UTC (rev 6737)
@@ -21,9 +21,9 @@
http://muzso.hu/2011/06/04/patch-for-squirrel-sql-client-v3.2.1-adds-keyboard-shortcut-for-sql-query-rerun-re-execut
See also bug #1057.
-1609223: New option to enables SQL result tables to read more query results when the user scrolls to the end of the table.
+1609223: New option to enable SQL result tables to read more query results when the user scrolls to the end of the table.
This option can be switched on in Session Properties and on top of the SQL-Editor just at the place where the
- "Limit tows" check box is.
+ "Limit rows" check box is.
2569169: Find function for SQL result tables.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6736
http://sourceforge.net/p/squirrel-sql/code/6736
Author: gerdwagner
Date: 2013-01-22 21:57:00 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Removed unnecessary warnings
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java 2013-01-13 17:46:17 UTC (rev 6735)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java 2013-01-22 21:57:00 UTC (rev 6736)
@@ -28,18 +28,10 @@
public RerunCurrentSQLResultTabAction(IApplication app)
{
super(app);
- if (app == null)
- {
- s_log.warn("RerunCurrentSQLResultTabAction(): IApplication == null");
- }
}
public void setSQLPanel(ISQLPanelAPI panel)
{
- if (panel == null)
- {
- s_log.warn("setSQLPanel(): ISQLPanelAPI == null");
- }
_panel = panel;
setEnabled(_panel != null);
}
@@ -61,20 +53,8 @@
{
selectedResultTab.reRunSQL();
}
- else
- {
- s_log.warn("actionPerformed(): IResultTab == null");
- }
}
- else
- {
- s_log.warn("actionPerformed(): ISQLResultExecuter == null");
- }
}
- else
- {
- s_log.warn("actionPerformed(): ISQLPanelAPI == null");
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2013-01-13 17:46:19
|
Revision: 6735
http://sourceforge.net/p/squirrel-sql/code/6735
Author: gerdwagner
Date: 2013-01-13 17:46:17 +0000 (Sun, 13 Jan 2013)
Log Message:
-----------
Logging of Application shutdown:
Sometimes closing SQuirreL can take some time. From looking at the log file
one can find out which shutdown actions take long:
Choose log level: info
Search the log file for: "Application.shutdown"
The first Global preferences tab tells where log and log configuration files are.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2013-01-11 22:35:59 UTC (rev 6734)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2013-01-13 17:46:17 UTC (rev 6735)
@@ -8,7 +8,7 @@
Enhancements:
-Logging of Application shutdown:
+Logging of application shutdown:
Sometimes closing SQuirreL can take some time. From looking at the log file
one can find out which shutdown actions take long:
Choose log level: info
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2013-01-11 22:36:02
|
Revision: 6734
http://sourceforge.net/p/squirrel-sql/code/6734
Author: gerdwagner
Date: 2013-01-11 22:35:59 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
Logging of Application shutdown:
Sometimes closing SQuirreL can take some time. From looking at the log file
one can find out which shutdown actions take long:
Choose log level: info
Search the log file for: "Application.shutdown"
The first Global preferences tab tells where log and log configuration files are.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2013-01-08 12:23:22 UTC (rev 6733)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2013-01-11 22:35:59 UTC (rev 6734)
@@ -227,27 +227,40 @@
*/
public boolean shutdown(boolean updateLaunchScript)
{
- s_log.info(s_stringMgr.getString("Application.shutdown", Calendar.getInstance().getTime()));
+ long begin = System.currentTimeMillis();
+ s_log.info("Application.shutdown: BEGIN: " + Calendar.getInstance().getTime());
+
updateCheckTimer.stop();
-
- saveApplicationState();
+ s_log.info("Application.shutdown: updateCheckTimer.stop() ELAPSED: " + (System.currentTimeMillis() - begin));
- if (!closeAllSessions()) { return false; }
- _pluginManager.unloadPlugins();
+ _saveApplicationState(begin);
+ s_log.info("Application.shutdown: saveApplicationState() ELAPSED: " + (System.currentTimeMillis() - begin));
+ if (!closeAllSessions())
+ {
+ return false;
+ }
+
+ _pluginManager.unloadPlugins();
+ s_log.info("Application.shutdown: _pluginManager.unloadPlugins() ELAPSED: " + (System.currentTimeMillis() - begin));
+
closeAllViewers();
+ s_log.info("Application.shutdown: closeAllViewers() ELAPSED: " + (System.currentTimeMillis() - begin));
closeOutputStreams();
+ s_log.info("Application.shutdown: closeOutputStreams() ELAPSED: " + (System.currentTimeMillis() - begin));
SchemaInfoCacheSerializer.waitTillStoringIsDone();
-
- if (updateLaunchScript) {
+ s_log.info("Application.shutdown: SchemaInfoCacheSerializer.waitTillStoringIsDone() ELAPSED: " + (System.currentTimeMillis() - begin));
+
+ if (updateLaunchScript)
+ {
updateLaunchScript();
+ s_log.info("Application.shutdown: updateLaunchScript() ELAPSED: " + (System.currentTimeMillis() - begin));
}
- String msg = s_stringMgr.getString("Application.shutdowncomplete", Calendar.getInstance().getTime());
- s_log.info(msg);
+ s_log.info("Application.shutdown END: " + Calendar.getInstance().getTime());
LoggerController.shutdown();
return true;
@@ -258,37 +271,55 @@
*/
public void saveApplicationState()
{
+ _saveApplicationState(null);
+ }
- _prefs.setFirstRun(false);
+ private void _saveApplicationState(Long begin)
+ {
+ if(null == begin)
+ {
+ begin = System.currentTimeMillis();
+ }
- for (ApplicationListener l : _listeners.toArray(new ApplicationListener[0]))
- {
- l.saveApplicationState();
- }
+ _prefs.setFirstRun(false);
+ s_log.info("Application.shutdown->_saveApplicationState: _prefs.setFirstRun(false) ELAPSED: " + (System.currentTimeMillis() - begin));
- saveDrivers();
+ for (ApplicationListener l : _listeners.toArray(new ApplicationListener[0]))
+ {
+ l.saveApplicationState();
+ }
+ s_log.info("Application.shutdown->_saveApplicationState: _listeners ELAPSED: " + (System.currentTimeMillis() - begin));
- saveAliases();
+ saveDrivers();
+ s_log.info("Application.shutdown->_saveApplicationState: saveDrivers() ELAPSED: " + (System.currentTimeMillis() - begin));
- // Save Application level SQL history.
- saveSQLHistory();
+ saveAliases();
+ s_log.info("Application.shutdown->_saveApplicationState: saveAliases() ELAPSED: " + (System.currentTimeMillis() - begin));
- // Save options selected for Cell Import Export operations
- saveCellImportExportInfo();
+ // Save Application level SQL history.
+ saveSQLHistory();
+ s_log.info("Application.shutdown->_saveApplicationState: saveSQLHistory() ELAPSED: " + (System.currentTimeMillis() - begin));
- // Save options selected for Edit Where Columns
- saveEditWhereColsInfo();
+ // Save options selected for Cell Import Export operations
+ saveCellImportExportInfo();
+ s_log.info("Application.shutdown->_saveApplicationState: saveCellImportExportInfo() ELAPSED: " + (System.currentTimeMillis() - begin));
- // Save options selected for DataType-specific properties
- saveDataTypePreferences();
-
- // Save user specific WIKI configurations
- saveUserSpecificWikiConfigurations();
+ // Save options selected for Edit Where Columns
+ saveEditWhereColsInfo();
+ s_log.info("Application.shutdown->_saveApplicationState: saveEditWhereColsInfo() ELAPSED: " + (System.currentTimeMillis() - begin));
- _prefs.save();
- }
+ // Save options selected for DataType-specific properties
+ saveDataTypePreferences();
+ s_log.info("Application.shutdown->_saveApplicationState: saveDataTypePreferences() ELAPSED: " + (System.currentTimeMillis() - begin));
- /**
+ // Save user specific WIKI configurations
+ saveUserSpecificWikiConfigurations();
+ s_log.info("Application.shutdown->_saveApplicationState: saveUserSpecificWikiConfigurations() ELAPSED: " + (System.currentTimeMillis() - begin));
+
+ _prefs.save();
+ }
+
+ /**
* Builds a Locale from the user's preferred locale preference.
*
* @param prefs
@@ -427,7 +458,7 @@
}
catch (Exception e)
{
- s_log.error("Unexpected exception while attempting to update the launch script: "+e.getMessage(), e);
+ s_log.info("Unexpected exception while attempting to update the launch script: " + e.getMessage());
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java 2013-01-08 12:23:22 UTC (rev 6733)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java 2013-01-11 22:35:59 UTC (rev 6734)
@@ -164,9 +164,9 @@
{
synchronized (SchemaInfoCacheSerializer.class)
{
- if(0 < _storingSessionIDs.size())
+ for(int i=0; 0 < _storingSessionIDs.size() || i >= 30; ++i)
{
- SchemaInfoCacheSerializer.class.wait(30000);
+ SchemaInfoCacheSerializer.class.wait(1000);
}
}
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2013-01-08 12:23:22 UTC (rev 6733)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2013-01-11 22:35:59 UTC (rev 6734)
@@ -8,6 +8,14 @@
Enhancements:
+Logging of Application shutdown:
+ Sometimes closing SQuirreL can take some time. From looking at the log file
+ one can find out which shutdown actions take long:
+ Choose log level: info
+ Search the log file for: "Application.shutdown"
+ The first Global preferences tab tells where log and log configuration files are.
+
+
Introduced keyboard shortcut Ctrl+Shift+Enter to rerun SQL results.
Thanks to Johnathan James for re-working and drawing attention to the patch hosted at
http://muzso.hu/2011/06/04/patch-for-squirrel-sql-client-v3.2.1-adds-keyboard-shortcut-for-sql-query-rerun-re-execut
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2013-01-08 12:23:27
|
Revision: 6733
http://sourceforge.net/p/squirrel-sql/code/6733
Author: gerdwagner
Date: 2013-01-08 12:23:22 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Introduced keyboard shortcut Ctrl+Shift+Enter to rerun SQL results.
Thanks to Johnathan James for re-working and drawing attention to the patch hosted at
http://muzso.hu/2011/06/04/patch-for-squirrel-sql-client-v3.2.1-adds-keyboard-shortcut-for-sql-query-rerun-re-execut
See also bug #1057.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2013-01-08 11:16:13 UTC (rev 6732)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2013-01-08 12:23:22 UTC (rev 6733)
@@ -488,6 +488,7 @@
add(new FormatSQLAction(_app));
add(new RenameSessionAction(_app));
+ add(new RerunCurrentSQLResultTabAction(_app));
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2013-01-08 11:16:13 UTC (rev 6732)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2013-01-08 12:23:22 UTC (rev 6733)
@@ -305,6 +305,7 @@
addToMenu(rsrc, GotoPreviousResultsTabAction.class, menu);
addToMenu(rsrc, GotoNextResultsTabAction.class, menu);
addToMenu(rsrc, ToggleCurrentSQLResultTabStickyAction.class, menu);
+ addToMenu(rsrc, RerunCurrentSQLResultTabAction.class, menu);
menu.addSeparator();
addToMenu(rsrc, ShowNativeSQLAction.class, menu);
menu.addSeparator();
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RerunCurrentSQLResultTabAction.java 2013-01-08 12:23:22 UTC (rev 6733)
@@ -0,0 +1,80 @@
+package net.sourceforge.squirrel_sql.client.session.action;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.ISQLResultExecuter;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+import java.awt.event.ActionEvent;
+
+public class RerunCurrentSQLResultTabAction extends SquirrelAction implements ISQLPanelAction
+{
+
+ /** Current panel. */
+ private ISQLPanelAPI _panel;
+
+ /** Logger for this class. */
+ private static final ILogger s_log =
+ LoggerController.createLogger(RerunCurrentSQLResultTabAction.class);
+
+ /**
+ * Ctor specifying Application API.
+ *
+ * @param app Application API.
+ */
+ public RerunCurrentSQLResultTabAction(IApplication app)
+ {
+ super(app);
+ if (app == null)
+ {
+ s_log.warn("RerunCurrentSQLResultTabAction(): IApplication == null");
+ }
+ }
+
+ public void setSQLPanel(ISQLPanelAPI panel)
+ {
+ if (panel == null)
+ {
+ s_log.warn("setSQLPanel(): ISQLPanelAPI == null");
+ }
+ _panel = panel;
+ setEnabled(_panel != null);
+ }
+
+ /**
+ * Close the current result tab
+ *
+ * @param evt Event being executed.
+ */
+ public synchronized void actionPerformed(ActionEvent evt)
+ {
+ if (_panel != null)
+ {
+ ISQLResultExecuter sqlResultExecuter = _panel.getSQLResultExecuter();
+ if (sqlResultExecuter != null)
+ {
+ IResultTab selectedResultTab = sqlResultExecuter.getSelectedResultTab();
+ if (selectedResultTab != null)
+ {
+ selectedResultTab.reRunSQL();
+ }
+ else
+ {
+ s_log.warn("actionPerformed(): IResultTab == null");
+ }
+ }
+ else
+ {
+ s_log.warn("actionPerformed(): ISQLResultExecuter == null");
+ }
+ }
+ else
+ {
+ s_log.warn("actionPerformed(): ISQLPanelAPI == null");
+ }
+ }
+}
+
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 2013-01-08 11:16:13 UTC (rev 6732)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2013-01-08 12:23:22 UTC (rev 6733)
@@ -29,25 +29,40 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JOptionPane;
+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.client.session.*;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
+import net.sourceforge.squirrel_sql.client.session.EditableSqlCheck;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo;
+import net.sourceforge.squirrel_sql.client.session.action.RerunCurrentSQLResultTabAction;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.OverviewCtrl;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
+import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.BaseDataSetViewerDestination;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ContinueReadChannel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetUpdateableTableModelListener;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetViewer;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ReadMoreResultsHandlerListener;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetMetaDataDataSet;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.TableState;
import net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.DataSetViewerFindDecorator;
import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
-import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -524,8 +539,7 @@
panel2.setLayout(new GridLayout(1, 3, 0, 0));
panel2.add(_readMoreResultsHandler.getLoadingLabel());
-
- panel2.add(new TabButton(new RerunAction(_session.getApplication())));
+ panel2.add(new TabButton(getRerunCurrentSQLResultTabAction()));
panel2.add(new TabButton(new FindInResultAction(_session.getApplication())));
panel2.add(new TabButton(new CreateResultTabFrameAction(_session.getApplication())));
panel2.add(new TabButton(new CloseAction()));
@@ -565,6 +579,15 @@
}
+ private RerunCurrentSQLResultTabAction getRerunCurrentSQLResultTabAction()
+ {
+ RerunCurrentSQLResultTabAction rtn = new RerunCurrentSQLResultTabAction(_session.getApplication());
+
+ rtn.setSQLPanel( _session.getSQLPanelAPIOfActiveSessionWindow() );
+
+ return rtn;
+ }
+
private void reInitOverview()
{
if(OverviewCtrl.isOverviewPanel(_tabResultTabs.getComponentAt(_tabResultTabs.getTabCount()-1)))
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2013-01-08 11:16:13 UTC (rev 6732)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2013-01-08 12:23:22 UTC (rev 6733)
@@ -589,6 +589,10 @@
action.net.sourceforge.squirrel_sql.client.session.action.OpenSqlHistoryAction.name=Open SQL History
action.net.sourceforge.squirrel_sql.client.session.action.OpenSqlHistoryAction.tooltip=Open SQL History
+action.net.sourceforge.squirrel_sql.client.session.action.RerunCurrentSQLResultTabAction.image=eclipse/active/run_exc.gif
+action.net.sourceforge.squirrel_sql.client.session.action.RerunCurrentSQLResultTabAction.name=Rerun the current tab's SQL Query
+action.net.sourceforge.squirrel_sql.client.session.action.RerunCurrentSQLResultTabAction.tooltip=Rerun the current tab's SQL Query
+
#Rename session properties
action.net.sourceforge.squirrel_sql.client.session.action.RenameSessionAction.name=Rename Session/Tab
action.net.sourceforge.squirrel_sql.client.session.action.RenameSessionAction.tooltip=Change name of session/tab
@@ -919,3 +923,5 @@
menuitem.net.sourceforge.squirrel_sql.client.session.action.FormatSQLAction.accelerator=control alt F
menuitem.net.sourceforge.squirrel_sql.client.session.action.FormatSQLAction.mnemonic=F
+menuitem.net.sourceforge.squirrel_sql.client.session.action.RerunCurrentSQLResultTabAction.accelerator=control shift ENTER
+menuitem.net.sourceforge.squirrel_sql.client.session.action.RerunCurrentSQLResultTabAction.mnemonic=r
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2013-01-08 11:16:13 UTC (rev 6732)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2013-01-08 12:23:22 UTC (rev 6733)
@@ -8,6 +8,11 @@
Enhancements:
+Introduced keyboard shortcut Ctrl+Shift+Enter to rerun SQL results.
+ Thanks to Johnathan James for re-working and drawing attention to the patch hosted at
+ http://muzso.hu/2011/06/04/patch-for-squirrel-sql-client-v3.2.1-adds-keyboard-shortcut-for-sql-query-rerun-re-execut
+ See also bug #1057.
+
1609223: New option to enables SQL result tables to read more query results when the user scrolls to the end of the table.
This option can be switched on in Session Properties and on top of the SQL-Editor just at the place where the
"Limit tows" check box is.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2013-01-08 11:16:18
|
Revision: 6732
http://sourceforge.net/p/squirrel-sql/code/6732
Author: gerdwagner
Date: 2013-01-08 11:16:13 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
#1009 FileNotFoundException when trying to save write protected file. (Thanks to Johnathan James for the patch.)
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java 2013-01-06 21:56:47 UTC (rev 6731)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java 2013-01-08 11:16:13 UTC (rev 6732)
@@ -220,6 +220,17 @@
private boolean saveScript(Frame frame, File file, boolean askReplace)
{
boolean doSave = false;
+
+ if (file.exists() && !file.canWrite())
+ {
+ // i18n[FileManager.error.cannotwritefile=File {0} \ncannot be written to.]
+ String msg =
+ s_stringMgr.getString("FileManager.error.cannotwritefile",
+ file.getAbsolutePath());
+ Dialogs.showOk(frame, msg);
+ return false;
+ }
+
if (askReplace && file.exists())
{
// i18n[FileManager.confirm.filereplace={0} \nalready exists. Do you want to replace it?]
@@ -233,15 +244,7 @@
{
return false;
}
- if (!file.canWrite())
- {
- // i18n[FileManager.error.cannotwritefile=File {0} \ncannot be written to.]
- String msg =
- s_stringMgr.getString("FileManager.error.cannotwritefile",
- file.getAbsolutePath());
- Dialogs.showOk(frame, msg);
- return false;
- }
+
file.delete();
}
else
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2013-01-06 21:56:47 UTC (rev 6731)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2013-01-08 11:16:13 UTC (rev 6732)
@@ -48,6 +48,8 @@
Bug fixes:
+#1009 FileNotFoundException when trying to save write protected file. (Thanks to Johnathan James for the patch.)
+
#1060 When more result tabs than the maximum defined in Session properties are in execution, SQuirreL freezes.
Fixed bug in logging: Log level could not be set in log4j.properties file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2013-01-06 21:56:50
|
Revision: 6731
http://sourceforge.net/p/squirrel-sql/code/6731
Author: gerdwagner
Date: 2013-01-06 21:56:47 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
#1060 When more result tabs than the maximum defined in Session properties are in execution, SQuirreL freezes.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2013-01-04 16:08:55 UTC (rev 6730)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2013-01-06 21:56:47 UTC (rev 6731)
@@ -794,6 +794,10 @@
while(props.getLimitSQLResultTabs() && props.getSqlResultTabLimit() < _tabbedExecutionsPanel.getTabCount())
{
+ if(_tabbedExecutionsPanel.getComponentAt(0) instanceof CancelPanel)
+ {
+ break;
+ }
closeTabAt(0);
}
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2013-01-04 16:08:55 UTC (rev 6730)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2013-01-06 21:56:47 UTC (rev 6731)
@@ -48,6 +48,8 @@
Bug fixes:
+#1060 When more result tabs than the maximum defined in Session properties are in execution, SQuirreL freezes.
+
Fixed bug in logging: Log level could not be set in log4j.properties file.
2759952 (Update fails unless run as admin on Vista): Fixed mis-spelled variable in squirrel-sql.bat which
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2013-01-04 16:08:58
|
Revision: 6730
http://sourceforge.net/p/squirrel-sql/code/6730
Author: gerdwagner
Date: 2013-01-04 16:08:55 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Fixed typo in Session Properties dialog (Thanks to Mike Curwen for the patch)
Modified Paths:
--------------
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties 2013-01-04 16:05:17 UTC (rev 6729)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties 2013-01-04 16:08:55 UTC (rev 6730)
@@ -15,7 +15,7 @@
SessionSQLPropertiesPanel.sqlhistory=SQL History
SessionSQLPropertiesPanel.solcomment=Start of Line Comment
SessionSQLPropertiesPanel.stmtsep=Statement Separator:
-SessionSQLPropertiesPanel.limitsqlresulttabs=Maximum limt of SQL Result Tabs
+SessionSQLPropertiesPanel.limitsqlresulttabs=Maximum limit of SQL Result Tabs
SessionSQLPropertiesPanel.tabs=tabs
SessionSQLPropertiesPanel.loadColumsInBackground=Load columns in background
SessionSQLPropertiesPanel.loadColsInBackgroundDescription=Loading columns in background might help users with databases that contain a lot of objects and/or users that work with low data transfer rates. Syntax highlightning and code completion may work less exact if this option is checked. It is recommended to use this option only if you feel that the SQL editor hangs.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2013-01-04 16:05:19
|
Revision: 6729
http://sourceforge.net/p/squirrel-sql/code/6729
Author: gerdwagner
Date: 2013-01-04 16:05:17 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Link fix on web site
Modified Paths:
--------------
trunk/sql12/web-site/home.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2012-12-31 17:06:29 UTC (rev 6728)
+++ trunk/sql12/web-site/home.html 2013-01-04 16:05:17 UTC (rev 6729)
@@ -321,7 +321,7 @@
<td class="body_left_border"> </td>
<td width='100%' bgcolor="white" valign="top">
<h1 class="body"><a name="svn">SVN</a></h1>
- <p>SVN is hosted at <A href="http://sourceforge.net/scm/?type=svn&group_id=28383">SourceForge</A>.
+ <p>SVN is hosted at <A href="http://sourceforge.net/p/squirrel-sql/code/6728/tree/">SourceForge</A>.
The SVN module for maintenance of the 1.1 release is
<EM>squirrel-sql</EM> and subsequent releases are made from the
<EM>sql12</EM> module.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-12-31 17:06:33
|
Revision: 6728
http://sourceforge.net/p/squirrel-sql/code/6728
Author: gerdwagner
Date: 2012-12-31 17:06:29 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
Fixed test
Modified Paths:
--------------
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/ResultSetReaderTest.java
Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/ResultSetReaderTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/ResultSetReaderTest.java 2012-12-29 19:33:48 UTC (rev 6727)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/ResultSetReaderTest.java 2012-12-31 17:06:29 UTC (rev 6728)
@@ -12,6 +12,7 @@
import java.sql.Timestamp;
import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.BlockMode;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DTProperties;
import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
@@ -102,7 +103,7 @@
mockHelper.replayAll();
readerUnderTest = new ResultSetReader(localMockResultSet, DialectType.MYSQL5);
- Object[] row = readerUnderTest.readRow();
+ Object[] row = readerUnderTest.readRow(BlockMode.INDIFFERENT);
assertEquals(unsignedIntegerValue, row[0]);
mockHelper.verifyAll();
}
@@ -124,7 +125,7 @@
replayAll();
readerUnderTest = new ResultSetReader(mockResultSet, DialectType.ORACLE);
- Object[] result = readerUnderTest.readRow();
+ Object[] result = readerUnderTest.readRow(BlockMode.INDIFFERENT);
if (result[0].getClass().getName().equals(type))
{
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-12-29 19:33:51
|
Revision: 6727
http://sourceforge.net/p/squirrel-sql/code/6727
Author: gerdwagner
Date: 2012-12-29 19:33:48 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Web page changes on Sourceforge Allura upgrade
Modified Paths:
--------------
trunk/sql12/web-site/home.html
trunk/sql12/web-site/left.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2012-12-29 18:56:07 UTC (rev 6726)
+++ trunk/sql12/web-site/home.html 2012-12-29 19:33:48 UTC (rev 6727)
@@ -74,7 +74,7 @@
<P><B>
For all changes and more details see <a
- href="http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc/src/main/resources/changes.txt">Changelog</a>.
+ href="http://sourceforge.net/p/squirrel-sql/code/6726/tree/trunk/sql12/doc/src/main/resources/changes.txt">Changelog</a>.
Please refer to SQuirreL's help section for an overview of all features.
<p><a href="#installation">Download SQuirreL SQL Client</A></p>
@@ -115,17 +115,10 @@
<td class="body_left_border"> </td>
<td width='100%' class="body" bgcolor="white" valign="top">
<h1 class="body"><a name="latestnews">Latest News</a></h1>
- <center>
- <iframe src="http://sourceforge.net/export/projnews.php?group_id=28383&limit=3&flat=0&show_summaries=0" width="800" height="300">
- <a href="http://sourceforge.net/export/projnews.php?group_id=28383&limit=3&flat=0&show_summaries=0">
- Your browser is not supported. Click here to proceed to project news summary.</a>
- </iframe>
- </center>
<br>
<center>
<h3 class="body">
- <a href="https://sourceforge.net/news/?group_id=28383">Click here</a>
- to go to our SourceForge news page for details.
+ <a href="http://sourceforge.net/p/squirrel-sql/news/">Click here</a> to go to our SourceForge news page.
</h3>
</center>
</td>
@@ -255,8 +248,16 @@
<p>To checkout SQuirreL from the subversion repository use the command:
<BR><code>
- svn co https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12
+ svn checkout svn://svn.code.sf.net/p/squirrel-sql/code/trunk/sql12
</code>
+ <BR>or
+ <BR><code>
+ svn checkout http://svn.code.sf.net/p/squirrel-sql/code/trunk/sql12
+ </code>
+ <p>Registered developers should use:
+ <BR><code>
+ svn checkout --username=<SF user name> svn+ssh://<SF user name>@svn.code.sf.net/p/squirrel-sql/code/trunk/sql12
+ </code>
</p>
<p><a href="index.php?page=programing">Click here for detailed information on how to program SQuirreL.</a></p>
Modified: trunk/sql12/web-site/left.html
===================================================================
--- trunk/sql12/web-site/left.html 2012-12-29 18:56:07 UTC (rev 6726)
+++ trunk/sql12/web-site/left.html 2012-12-29 19:33:48 UTC (rev 6727)
@@ -37,12 +37,12 @@
<td width='100%' class="menu_background">
<h1 class="menu">On SourceForge</h1>
<p class="menu_item"><a href="http://sourceforge.net/projects/squirrel-sql">Project Home</a></p>
- <p class="menu_item"><a href="http://sourceforge.net/project/showfiles.php?group_id=28383">Downloads</a></p>
- <p class="menu_item"><a href="http://sourceforge.net/news/?group_id=28383">News</a></p>
- <p class="menu_item"><a href="http://sourceforge.net/mail/?group_id=28383">Mailing Lists</a></p>
- <p class="menu_item"><a href="http://sourceforge.net/tracker/?atid=393414&group_id=28383">Bugs</a></p>
- <p class="menu_item"><a href="http://sourceforge.net/tracker/?atid=393417&group_id=28383">Feature Requests</a></p>
- <p class="menu_item"><a href="http://sourceforge.net/scm/?type=svn&group_id=28383">SVN</a> (<a href="https://sourceforge.net/apps/trac/squirrel-sql/browser/trunk/sql12">Trac</a>)</p>
+ <p class="menu_item"><a href="http://sourceforge.net/projects/squirrel-sql/files/">Downloads</a></p>
+ <p class="menu_item"><a href="http://sourceforge.net/p/squirrel-sql/news/">News</a></p>
+ <p class="menu_item"><a href="http://sourceforge.net/p/squirrel-sql/mailman/">Mailing Lists</a></p>
+ <p class="menu_item"><a href="http://sourceforge.net/p/squirrel-sql/bugs/">Bugs</a></p>
+ <p class="menu_item"><a href="http://sourceforge.net/p/squirrel-sql/feature-requests/">Feature Requests</a></p>
+ <p class="menu_item"><a href="http://sourceforge.net/p/squirrel-sql/code/6726/tree/">SVN</a></p>
<td class="menu_right_border"> </td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-12-29 18:56:09
|
Revision: 6726
http://sourceforge.net/p/squirrel-sql/code/6726
Author: gerdwagner
Date: 2012-12-29 18:56:07 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
clean up
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-12-29 11:30:01 UTC (rev 6725)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-12-29 18:56:07 UTC (rev 6726)
@@ -46,15 +46,15 @@
Positions of SQL result tabs and of Session tabs can now be changed using drag and drop.
+Bug fixes:
+
Fixed bug in logging: Log level could not be set in log4j.properties file.
-2759952 (Update fails unless run as admin on Vista): Fixed mis-spelled variable in squirrel-sql.bat which
+2759952 (Update fails unless run as admin on Vista): Fixed mis-spelled variable in squirrel-sql.bat which
caused the application updater to fail to work properly with Windows when UAC is enabled. Thanks to user
-dandar3 for the tip.
+dandar3 for the tip.
-Bug fixes:
-
Tables cells that contained html where rendered incorrect. Now the plain html string is shown.
When schema info was refreshed (using F5) the SQL editor used to color tables as undefined (error red).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <ger...@us...> - 2012-12-23 00:21:21
|
Revision: 6724
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6724&view=rev
Author: gerdwagner
Date: 2012-12-23 00:21:12 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
updated change log
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-12-23 00:15:16 UTC (rev 6723)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-12-23 00:21:12 UTC (rev 6724)
@@ -8,7 +8,7 @@
Enhancements:
-1609223 New option to enables SQL result tables to read more query results when the user scrolls to the end of the table.
+1609223: New option to enables SQL result tables to read more query results when the user scrolls to the end of the table.
This option can be switched on in Session Properties and on top of the SQL-Editor just at the place where the
"Limit tows" check box is.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-12-23 00:15:51
|
Revision: 6723
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6723&view=rev
Author: gerdwagner
Date: 2012-12-23 00:15:16 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
updated change log
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-12-22 20:01:55 UTC (rev 6722)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-12-23 00:15:16 UTC (rev 6723)
@@ -8,12 +8,12 @@
Enhancements:
-New option to enables SQL result tables to read more query results when the user scrolls to the end of the table.
+1609223 New option to enables SQL result tables to read more query results when the user scrolls to the end of the table.
This option can be switched on in Session Properties and on top of the SQL-Editor just at the place where the
"Limit tows" check box is.
-Find function for SQL result tables.
+2569169: Find function for SQL result tables.
Closing or reconnecting Sessions caused SQuirreL to hang when the JDBC driver's connection close method didn't return.
Now closing timeouts after 2 seconds.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-12-22 20:02:17
|
Revision: 6722
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6722&view=rev
Author: gerdwagner
Date: 2012-12-22 20:01:55 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
New option to enables SQL result tables to read more query results when the user scrolls to the end of the table.
This option can be switched on in Session Properties and on top of the SQL-Editor just at the place where the
"Limit tows" check box is.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/CancelStatementThread.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java
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/SQLExecutionHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionSQLPropertiesPanel.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/properties/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetDefinition.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ResultSetDataSet.java
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/DefaultFindService.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLDatabaseMetaData.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryBuilderController.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/MessageSQLExecuterHandler.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/handler/ProgressSQLExecuterHandler.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/explain/ExplainExecuterPanel.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/StatementWrapper.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CurrentSqlLabelController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandlerListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/ResultLimitAndReadOnPanelSmallPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SQLResultConfigCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SQLResultConfigCtrlListener.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/loading_gif.gif
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BlockMode.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ContinueReadChannel.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/DataSetViewerTableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ReadMoreResultsHandlerListener.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ResultSetWrapper.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleStatementCallback.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/StatementCallback.java
Removed Paths:
-------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -102,6 +102,7 @@
String UNMARK = "unmark";
String TABLE = "table";
String HIDE = "hide";
+ String LOADING_GIF = "loading_gif";
}
public SquirrelResources(String rsrcBundleBaseName)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/CancelStatementThread.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/CancelStatementThread.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/CancelStatementThread.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -7,8 +7,6 @@
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-import java.sql.Statement;
-
public class CancelStatementThread extends Thread
{
private static final StringManager s_stringMgr =
@@ -17,14 +15,14 @@
private static final ILogger s_log = LoggerController.createLogger(CancelStatementThread.class);
- private Statement _stmt;
+ private StatementWrapper _stmtWrapper;
private IMessageHandler _messageHandler;
private boolean _threadFinished;
private boolean _joinReturned;
- public CancelStatementThread(Statement stmt, IMessageHandler messageHandler)
+ public CancelStatementThread(StatementWrapper stmtWrapper, IMessageHandler messageHandler)
{
- _stmt = stmt;
+ _stmtWrapper = stmtWrapper;
_messageHandler = messageHandler;
}
@@ -63,8 +61,8 @@
try
{
- if (_stmt != null) {
- _stmt.cancel();
+ if (_stmtWrapper != null) {
+ _stmtWrapper.cancel();
}
cancelSucceeded = true;
}
@@ -83,8 +81,8 @@
// cancel and stop fetching results. This allows us to stop the query
// processing gracefully.
Utilities.sleep(500);
- if (_stmt != null) {
- _stmt.close();
+ if (_stmtWrapper != null) {
+ _stmtWrapper.closeIfContinueReadIsNotActive();
}
closeSucceeded = true;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultSQLExecuterHandler.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -16,12 +16,12 @@
* 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.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.util.ArrayList;
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetWrapper;
/**
* This default implementation of the sql executer handler simply notifies the
@@ -50,7 +50,7 @@
{
}
- public void sqlResultSetAvailable(ResultSet rst, SQLExecutionInfo info,
+ public void sqlResultSetAvailable(ResultSetWrapper rst, SQLExecutionInfo info,
IDataSetUpdateableTableModel model)
{
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLExecuterHandler.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -17,12 +17,12 @@
* 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.sql.ResultSet;
import java.sql.SQLWarning;
import java.util.ArrayList;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetWrapper;
/**
* This interface is the call back interface used during execution
@@ -61,7 +61,7 @@
* <p/>This callback is called from the thread that the SQLExecuter is running on.
* It may or may not be the Swing thread so card should be taken with any gui actions
*/
- public void sqlResultSetAvailable(ResultSet rst, SQLExecutionInfo info,
+ public void sqlResultSetAvailable(ResultSetWrapper rst, SQLExecutionInfo info,
IDataSetUpdateableTableModel model) throws DataSetException;
/** Called when the SQLExecutor succesfully completes execution of a sql
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -30,7 +30,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLWarning;
-import java.sql.Statement;
import java.util.ArrayList;
import javax.swing.SwingUtilities;
@@ -38,15 +37,10 @@
import net.sourceforge.squirrel_sql.client.session.event.ISQLExecutionListener;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfoUpdateCheck;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetUpdateableTableModelListener;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataModelImplementationDetails;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
import net.sourceforge.squirrel_sql.fw.sql.TableInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -78,7 +72,6 @@
/** SQL passed in to be executed. */
private String _sql;
- private Statement _stmt;
private boolean _stopExecution = false;
private int _currentQueryIndex = 0;
@@ -88,6 +81,7 @@
private IQueryTokenizer _tokenizer = null;
/** Whether or not to check if the schema should be updated */
private boolean schemaCheck = true;
+ private StatementWrapper _statementWrapper;
public SQLExecuterTask(ISession session, String sql,ISQLExecuterHandler handler)
{
@@ -150,21 +144,19 @@
try
{
final ISQLConnection conn = _session.getSQLConnection();
- _stmt = conn.createStatement();
+ _statementWrapper = new StatementWrapper(conn.createStatement(), _session);
try
{
- if(props.getSQLUseFetchSize() && props.getSQLFetchSize() > 0)
- {
- setFetchSize(props);
- }
+ _statementWrapper.setFetchSize();
+
-
- final boolean correctlySupportsMaxRows = conn.getSQLMetaData()
- .correctlySupportsSetMaxRows();
- if (correctlySupportsMaxRows && props.getSQLLimitRows())
+ final boolean correctlySupportsMaxRows = conn.getSQLMetaData().correctlySupportsSetMaxRows();
+
+ //boolean maxRowsHasBeenSet = false;
+ if (correctlySupportsMaxRows)
{
- setMaxRows(props);
+ _statementWrapper.setMaxRows();
}
if(_tokenizer.getQueryCount() == 0)
@@ -174,8 +166,6 @@
_currentQueryIndex = 0;
- // Process each individual query.
- boolean maxRowsHasBeenSet = correctlySupportsMaxRows;
int processedStatementCount = 0;
statementCount = _tokenizer.getQueryCount();
@@ -195,29 +185,24 @@
// Some driver don't correctly support setMaxRows. In
// these cases use setMaxRows only if this is a
// SELECT.
- if (!correctlySupportsMaxRows
- && props.getSQLLimitRows())
+ if (false == correctlySupportsMaxRows)
{
if (isSelectStatement(querySql))
{
- if (!maxRowsHasBeenSet)
- {
- setMaxRows(props);
- maxRowsHasBeenSet = true;
- }
+ _statementWrapper.setMaxRows();
}
- else if (maxRowsHasBeenSet)
+ else if (_statementWrapper.isMaxRowsWasSet())
{
- _stmt.close();
- _stmt = conn.createStatement();
- maxRowsHasBeenSet = false;
+ _statementWrapper.closeIfContinueReadIsNotActive();
+ _statementWrapper = new StatementWrapper(conn.createStatement(), _session);
}
}
+
try
{
lastExecutedStatement = querySql;
- if (!processQuery(querySql, processedStatementCount, statementCount))
+ if (!processQuery(querySql, processedStatementCount, statementCount, _statementWrapper))
{
break;
}
@@ -256,14 +241,7 @@
}
finally
{
- try
- {
- _stmt.close();
- }
- finally
- {
- _stmt = null;
- }
+ _statementWrapper.closeIfContinueReadIsNotActive();
}
}
catch (final Throwable ex)
@@ -294,9 +272,9 @@
}
try
{
- if (_stmt != null)
+ if (_statementWrapper != null)
{
- _stmt.cancel();
+ _statementWrapper.cancel();
}
}
catch (Throwable th)
@@ -340,33 +318,6 @@
}
}
- /**
- * Set the fetchSize Arrtibute for the SQL-Statement;
- */
- private void setFetchSize(SessionProperties props)
- {
- try
- {
- _stmt.setFetchSize(props.getSQLFetchSize());
- }
- catch (Exception e)
- {
- s_log.error("Can't Set FetchSize", e);
- }
- }
-
- private void setMaxRows(final SessionProperties props)
- {
- try
- {
- _stmt.setMaxRows(props.getSQLNbrRowsToShow());
- }
- catch (Exception e)
- {
- s_log.error("Can't Set MaxRows", e);
- }
- }
-
/**
* Returns a boolean indicating whether or not the specified querySql appears to be a SELECT statement.
*
@@ -395,23 +346,24 @@
_session.getApplication().getMessageHandler().showMessage(msg);
_stopExecution = true;
- if (_stmt != null)
+
+ if (null != _statementWrapper)
{
- CancelStatementThread cst = new CancelStatementThread(_stmt, _session.getApplication().getMessageHandler());
+ CancelStatementThread cst = new CancelStatementThread(_statementWrapper, _session.getApplication().getMessageHandler());
cst.tryCancel();
}
}
- private boolean processQuery(String sql, int processedStatementCount, int statementCount) throws SQLException
+ private boolean processQuery(String sql, int processedStatementCount, int statementCount, StatementWrapper statementWrapper) throws SQLException
{
++_currentQueryIndex;
- final SQLExecutionInfo exInfo = new SQLExecutionInfo( _currentQueryIndex, sql, getMaxRows(_stmt));
- boolean firstResultIsResultSet = _stmt.execute(sql);
+ final SQLExecutionInfo exInfo = new SQLExecutionInfo( _currentQueryIndex, sql, statementWrapper.getMaxRows());
+ boolean firstResultIsResultSet = statementWrapper.execute(sql);
exInfo.sqlExecutionComplete();
// Display any warnings generated by the SQL execution.
- handleAllWarnings(_session.getSQLConnection(), _stmt);
+ handleAllWarnings(_session.getSQLConnection(), statementWrapper);
boolean supportsMultipleResultSets = _session.getSQLConnection().getSQLMetaData().supportsMultipleResultSets();
boolean inFirstLoop = true;
@@ -427,16 +379,16 @@
}
- int updateCount = _stmt.getUpdateCount();
+ int updateCount = statementWrapper.getUpdateCount();
- ResultSet res = null;
+ ResultSetWrapper res = null;
if (inFirstLoop && firstResultIsResultSet)
{
- res = _stmt.getResultSet();
+ res = statementWrapper.getResultSetWrapper();
}
else if(false == inFirstLoop)
{
- res = _stmt.getResultSet();
+ res = statementWrapper.getResultSetWrapper();
}
@@ -464,9 +416,9 @@
// Each call to _stmt.getMoreResults() places the to the next output.
// As long as it is a ResultSet, we process it ...
- if(supportsMultipleResultSets && _stmt.getMoreResults())
+ if(supportsMultipleResultSets && statementWrapper.getMoreResults())
{
- res = _stmt.getResultSet();
+ res = statementWrapper.getResultSetWrapper();
moreResultsReceived = true;
}
else
@@ -478,7 +430,7 @@
if (moreResultsReceived) {
// ... now we have reached an output that is not a result. We now have to ask for this
// outputs update count - but only if we received more results.
- updateCount = _stmt.getUpdateCount();
+ updateCount = statementWrapper.getUpdateCount();
}
}
@@ -505,7 +457,7 @@
break;
}
- if (!_stmt.getMoreResults() && -1 == updateCount)
+ if (!statementWrapper.getMoreResults() && -1 == updateCount)
{
// There is no need to close result sets if we call _stmt.getMoreResults() because it
// implicitly closes any current ResultSet.
@@ -541,27 +493,6 @@
return true;
}
- /**
- * Some drivers, such as SQLite, don't properly support getMaxRows/setMaxRows for statements.
- *
- * @param stmt the statement to get the max rows that could be returned in a result set for.
- *
- * @return the max number of rows that could be returned by this statement
- */
- private int getMaxRows(Statement stmt) {
- int result = 0;
- try
- {
- result = stmt.getMaxRows();
- }
- catch (SQLException e)
- {
- if (s_log.isDebugEnabled()) {
- s_log.debug("Unexpected exception: "+e.getMessage(), e);
- }
- }
- return result;
- }
private void fireExecutionListeners(final String sql)
{
@@ -597,33 +528,41 @@
- private boolean processResultSet(final ResultSet rs, final SQLExecutionInfo exInfo)
+ private boolean processResultSet(final ResultSetWrapper rs, final SQLExecutionInfo exInfo)
{
if (_stopExecution)
{
return false;
}
- if (_handler != null) {
- try {
- _handler.sqlResultSetAvailable(rs, exInfo, this);
- } catch (DataSetException ex) {
- if (_stopExecution) {
- return false;
- } else {
- _session.showMessage(ex);
- s_log.error("Error reading ResultSet for SQL: "
- + exInfo.getSQL(), ex);
- }
+ if (_handler != null)
+ {
+ try
+ {
+ _handler.sqlResultSetAvailable(rs, exInfo, this);
+ }
+ catch (DataSetException ex)
+ {
+ if (_stopExecution)
+ {
+ return false;
}
- }
+ else
+ {
+ _session.showMessage(ex);
+ s_log.error("Error reading ResultSet for SQL: "
+ + exInfo.getSQL(), ex);
+ }
+ }
+ }
- handleResultSetWarnings(rs);
- SQLUtilities.closeResultSet(rs);
+ handleResultSetWarnings(rs.getResultSet());
+
+ rs.closeIfContinueReadIsNotActive();
return true;
}
- private void handleAllWarnings(ISQLConnection conn, Statement stmt)
+ private void handleAllWarnings(ISQLConnection conn, StatementWrapper stmtWrapper)
{
// If SQL executing produced warnings then write them out to the session
// message handler. TODO: This is a pain. PostgreSQL sends "raise
@@ -645,8 +584,8 @@
try
{
- handleWarnings(stmt.getWarnings());
- stmt.clearWarnings();
+ handleWarnings(stmtWrapper.getWarnings());
+ stmtWrapper.clearWarnings();
}
catch (Throwable th)
{
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/StatementWrapper.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/StatementWrapper.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/StatementWrapper.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -0,0 +1,231 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetWrapper;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.StatementCallback;
+import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+import java.util.ArrayList;
+
+public class StatementWrapper implements StatementCallback
+{
+ private static final ILogger s_log = LoggerController.createLogger(StatementWrapper.class);
+
+ private boolean _maxRowsWasSet;
+ private ISession _session;
+ private Statement _statement;
+ private ArrayList<ResultSetWrapper> _resultSetWrappers = new ArrayList<ResultSetWrapper>();
+ private boolean _hasReturnedResultSet;
+
+ public StatementWrapper(Statement stmt)
+ {
+ this(stmt, null);
+ }
+
+ public StatementWrapper(Statement statement, ISession session)
+ {
+ _session = session;
+ _statement = statement;
+ }
+
+
+ public void setMaxRows()
+ {
+ if(null == _session || isContinueReadActive())
+ {
+ return;
+ }
+
+
+ if(_session.getProperties().getSQLLimitRows())
+ {
+ _maxRowsWasSet = true;
+ try
+ {
+ _statement.setMaxRows(_session.getProperties().getSQLNbrRowsToShow());
+ }
+ catch (Exception e)
+ {
+ s_log.error("Can't Set MaxRows", e);
+ }
+ }
+
+ }
+
+ @Override
+ public boolean isMaxRowsWasSet()
+ {
+ return _maxRowsWasSet;
+ }
+
+ @Override
+ public int getMaxRowsCount()
+ {
+ return _session.getProperties().getSQLNbrRowsToShow();
+ }
+
+ public void setFetchSize()
+ {
+ if(null == _session)
+ {
+ return;
+ }
+
+
+ if(_session.getProperties().getSQLUseFetchSize() && _session.getProperties().getSQLFetchSize() > 0)
+ {
+ try
+ {
+ _statement.setFetchSize(_session.getProperties().getSQLFetchSize());
+ }
+ catch (Exception e)
+ {
+ s_log.error("Can't Set FetchSize", e);
+ }
+ }
+ }
+
+
+ public void cancel() throws SQLException
+ {
+ _statement.cancel();
+ }
+
+ public ResultSetWrapper getResultSetWrapper() throws SQLException
+ {
+ ResultSet resultSet = _statement.getResultSet();
+
+ if(null == resultSet)
+ {
+ // Happens when executing procs with more than on result set
+ return null;
+ }
+
+ _hasReturnedResultSet = true;
+
+
+ ResultSetWrapper resultSetWrapper = new ResultSetWrapper(resultSet, this);
+ _resultSetWrappers.add(resultSetWrapper);
+ return resultSetWrapper;
+ }
+
+ public boolean getMoreResults() throws SQLException
+ {
+ if(isContinueReadActive() && _hasReturnedResultSet)
+ {
+
+ // _statement.getMoreResults() will implicitly close any current ResultSet. (see API doc of Statement.getMoreResults())
+ // So when continueRead is active we cannot support multipple result sets anymore.
+ // Another reason why not to choose this option. :-)
+ return false;
+ }
+
+ return _statement.getMoreResults();
+ }
+
+ /**
+ * Some drivers, such as SQLite, don't properly support getMaxRows/setMaxRows for statements.
+ *
+ * @return the max number of rows that could be returned by this statement
+ */
+ public int getMaxRows()
+ {
+ int result = 0;
+ try
+ {
+ result = _statement.getMaxRows();
+ }
+ catch (SQLException e)
+ {
+ if (s_log.isDebugEnabled())
+ {
+ s_log.debug("Unexpected exception: " + e.getMessage(), e);
+ }
+ }
+ return result;
+ }
+
+ public SQLWarning getWarnings() throws SQLException
+ {
+ return _statement.getWarnings();
+ }
+
+ public void clearWarnings() throws SQLException
+ {
+ _statement.clearWarnings();
+ }
+
+ public boolean execute(String sql) throws SQLException
+ {
+ return _statement.execute(sql);
+ }
+
+ public int getUpdateCount() throws SQLException
+ {
+ if(isContinueReadActive() && _hasReturnedResultSet)
+ {
+ // This is needed to stop the executer to ask for more results
+ return -1;
+ }
+
+ return _statement.getUpdateCount();
+ }
+
+ @Override
+ public boolean isContinueReadActive()
+ {
+ return _session.getProperties().getSQLReadOn();
+ }
+
+ @Override
+ public int getFirstBlockCount()
+ {
+ return _session.getProperties().getSQLReadOnBlockSize();
+ }
+
+ @Override
+ public int getContinueBlockCount()
+ {
+ return _session.getProperties().getSQLReadOnBlockSize();
+ }
+
+ @Override
+ public void closeStatementIfContinueReadActive()
+ {
+ if (false == isContinueReadActive())
+ {
+ return;
+ }
+
+ _closeStatement();
+ }
+
+ public void closeIfContinueReadIsNotActive() throws SQLException
+ {
+ if(isContinueReadActive())
+ {
+ return;
+ }
+
+ _closeStatement();
+ }
+
+ private void _closeStatement()
+ {
+ try
+ {
+ SQLUtilities.closeStatement(_statement);
+ }
+ finally
+ {
+ _statement = null;
+ }
+ }
+
+
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CurrentSqlLabelController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CurrentSqlLabelController.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CurrentSqlLabelController.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -0,0 +1,54 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel;
+
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
+
+import javax.swing.*;
+
+public class CurrentSqlLabelController
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(CurrentSqlLabelController.class);
+
+
+ private String _sql;
+ private JLabel _lbl = new JLabel();
+
+ public CurrentSqlLabelController()
+ {
+ }
+
+ public void reInit(int rowCount, boolean areAllPossibleResultsOfSQLRead)
+ {
+ String escapedSql = Utilities.escapeHtmlChars(_sql);
+
+ if (areAllPossibleResultsOfSQLRead)
+ {
+ // i18n[ResultTab.rowsMessage=Rows {0}]
+ String rowsMsg = s_stringMgr.getString("ResultTab.rowsMessage", Integer.valueOf(rowCount));
+ _lbl.setText("<html><pre> " + rowsMsg + "; " + escapedSql + "</pre></html>");
+ }
+ else
+ {
+ // i18n[ResultTab.limitMessage=Limited to <font color='red'> {0} </font> rows]
+ String limitMsg = s_stringMgr.getString("ResultTab.limitMessage", Integer.valueOf(rowCount));
+ _lbl.setText("<html><pre> " + limitMsg + "; " + escapedSql + "</pre></html>");
+ }
+ }
+
+ public void clear()
+ {
+ _sql = "";
+ _lbl.setText("");
+ }
+
+ public JLabel getLabel()
+ {
+ return _lbl;
+ }
+
+ public void setSql(String sql)
+ {
+ _sql = sql;
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -70,10 +70,7 @@
*/
String getTitle();
- /**
- * Close this tab.
- */
- void closeTab();
+ void closeTab();
void returnToTabbedPane();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -23,6 +23,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget;
import net.sourceforge.squirrel_sql.client.session.CancelStatementThread;
+import net.sourceforge.squirrel_sql.client.session.StatementWrapper;
import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -40,7 +41,6 @@
* @author Thorsten Mürell
*/
public class PleaseWaitDialog extends DialogWidget implements ActionListener {
- private static final long serialVersionUID = 8870277695490954084L;
private static final StringManager stringMgr =
StringManagerFactory.getStringManager(PleaseWaitDialog.class);
@@ -104,7 +104,7 @@
public void actionPerformed(ActionEvent e) {
if (stmt != null) {
- CancelStatementThread cst = new CancelStatementThread(stmt, messageHandler);
+ CancelStatementThread cst = new CancelStatementThread(new StatementWrapper(stmt), messageHandler);
cst.tryCancel();
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -24,15 +24,19 @@
createGUI();
}
- void load(int rowCount,
- SQLExecutionInfo exInfo)
+ void load(int rowCount, SQLExecutionInfo exInfo)
{
_queryLbl.setText(StringUtilities.cleanString(exInfo.getSQL()));
- _rowCountLbl.setText(String.valueOf(rowCount));
+ displayRowCount(rowCount);
_executedLbl.setText(exInfo.getSQLExecutionStartTime().toString());
_elapsedLbl.setText(formatElapsedTime(exInfo));
}
+ public void displayRowCount(int rowCount)
+ {
+ _rowCountLbl.setText(String.valueOf(rowCount));
+ }
+
private String formatElapsedTime(SQLExecutionInfo exInfo)
{
final NumberFormat nbrFmt = NumberFormat.getNumberInstance();
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandler.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandler.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -0,0 +1,89 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel;
+
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ReadMoreResultsHandlerListener;
+
+import javax.swing.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class ReadMoreResultsHandler
+{
+ private ISession _session;
+ private final JLabel _lblLoading;
+ private final ImageIcon _loadingGif;
+ private ExecutorService _executorService;
+ private Future<SwingWorker<SwingWorker, Object>> _future;
+
+
+ public ReadMoreResultsHandler(ISession session)
+ {
+ _session = session;
+
+ _loadingGif = _session.getApplication().getResources().getIcon(SquirrelResources.IImageNames.LOADING_GIF);
+ _lblLoading = new JLabel(_loadingGif);
+ _lblLoading.setVisible(false);
+
+ _executorService = Executors.newFixedThreadPool(1);
+
+ }
+
+ public void readMoreResults(final ResultSetDataSet rsds, final ReadMoreResultsHandlerListener readChannelCallBack)
+ {
+ if(null != _future && false == _future.isDone())
+ {
+ return;
+ }
+
+ _lblLoading.setVisible(true);
+
+ SwingWorker<SwingWorker, Object> sw =
+ new SwingWorker<SwingWorker, Object>()
+ {
+ @Override
+ protected SwingWorker doInBackground()
+ {
+ rsds.readMoreResults();
+ return this;
+ }
+
+ @Override
+ protected void done()
+ {
+ try
+ {
+ get();
+ onReadMoreResultsDone(readChannelCallBack);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ };
+
+ _future = (Future<SwingWorker<SwingWorker, Object>>) _executorService.submit(sw);
+ }
+
+ private void onReadMoreResultsDone(net.sourceforge.squirrel_sql.fw.datasetviewer.ReadMoreResultsHandlerListener readChannelCallBack)
+ {
+ try
+ {
+ _lblLoading.setVisible(false);
+ readChannelCallBack.moreResultsHaveBeenRead();
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+ }
+
+ public JLabel getLoadingLabel()
+ {
+ return _lblLoading;
+ }
+
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandlerListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandlerListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ReadMoreResultsHandlerListener.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel;
+
+public interface ReadMoreResultsHandlerListener
+{
+ void moreResultsHaveBeenRead();
+}
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-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -36,6 +36,7 @@
import net.sourceforge.squirrel_sql.client.session.*;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.OverviewCtrl;
import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ReadMoreResultsHandlerListener;
import net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.DataSetViewerFindDecorator;
import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
@@ -47,7 +48,6 @@
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
-import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -82,7 +82,7 @@
private SQLResultExecuterPanelFacade _sqlResultExecuterPanelFacade;
/** Label shows the current SQL script. */
- private JLabel _currentSqlLbl = new JLabel();
+ private CurrentSqlLabelController _currentSqlLblCtrl = new CurrentSqlLabelController();
/** The SQL execurtes, cleaned up for display. */
private String _sql;
@@ -99,7 +99,6 @@
private ResultSetDataSet _rsds;
- /** Internationalized strings for this class. */
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ResultTab.class);
private static ILogger s_log = LoggerController.createLogger(ResultTab.class);
@@ -107,6 +106,8 @@
private ResultTabListener _resultTabListener;
+ private ReadMoreResultsHandler _readMoreResultsHandler;
+ private boolean _tabIsClosing;
/**
* Ctor.
@@ -146,11 +147,14 @@
init(creator, exInfo);
+
+ _readMoreResultsHandler = new ReadMoreResultsHandler(_session);
+
createGUI();
propertiesHaveChanged(null);
}
- /**
+ /**
* @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#reInit(net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel, net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo)
*/
private void init(IDataSetUpdateableTableModel creator, SQLExecutionInfo exInfo)
@@ -242,27 +246,18 @@
_exInfo = exInfo;
_sql = StringUtilities.cleanString(exInfo.getSQL());
+
+ _rsds = rsds;
+
// Display the result set.
_resultSetOutput.getDataSetViewer().show(rsds, null);
- _rsds = rsds;
+ initContinueReadChannel(_resultSetOutput);
- final int rowCount = _resultSetOutput.getDataSetViewer().getRowCount();
- final int maxRows =_exInfo.getMaxRows();
- String escapedSql = Utilities.escapeHtmlChars(_sql);
+ final int rowCount = _rsds.currentRowCount();
- if (maxRows > 0 && rowCount >= maxRows)
- {
- // i18n[ResultTab.limitMessage=Limited to <font color='red'> {0} </font> rows]
- String limitMsg = s_stringMgr.getString("ResultTab.limitMessage", Integer.valueOf(rowCount));
- _currentSqlLbl.setText("<html><pre> " + limitMsg + "; " + escapedSql + "</pre></html>");
- }
- else
- {
- // i18n[ResultTab.rowsMessage=Rows {0}]
- String rowsMsg = s_stringMgr.getString("ResultTab.rowsMessage", Integer.valueOf(rowCount));
- _currentSqlLbl.setText("<html><pre> " + rowsMsg + "; " + escapedSql + "</pre></html>");
- }
+ _currentSqlLblCtrl.setSql(_sql);
+ _currentSqlLblCtrl.reInit(_rsds.currentRowCount(), _rsds.areAllPossibleResultsOfSQLRead());
// Display the result set metadata.
if (mdds != null && _metaDataOutput != null)
@@ -273,22 +268,76 @@
_queryInfoPanel.load(rowCount, _exInfo);
}
+
+ private void initContinueReadChannel(DataSetViewerFindDecorator resultSetOutput)
+ {
+ final ReadMoreResultsHandlerListener readMoreResultsHandlerListener = new ReadMoreResultsHandlerListener()
+ {
+ @Override
+ public void moreResultsHaveBeenRead()
+ {
+ onMoreResultsHaveBeenRead();
+ }
+ };
+
+ resultSetOutput.getDataSetViewer().setContinueReadChannel(new ContinueReadChannel()
+ {
+ @Override
+ public void readMoreResults()
+ {
+ onReadMoreResults(readMoreResultsHandlerListener);
+ }
+
+ @Override
+ public void closeStatementAndResultSet()
+ {
+ onCloseStatementAndResultSet();
+ }
+ });
+ }
+
+ private void onCloseStatementAndResultSet()
+ {
+ _rsds.closeStatementAndResultSet();
+ }
+
+ private void onReadMoreResults(ReadMoreResultsHandlerListener readMoreResultsHandlerListener)
+ {
+ if(_rsds.isAllResultsRead())
+ {
+ return;
+ }
+
+ _readMoreResultsHandler.readMoreResults(_rsds, readMoreResultsHandlerListener);
+ }
+
+ private void onMoreResultsHaveBeenRead()
+ {
+ try
+ {
+
+ TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
+ _resultSetOutput.getDataSetViewer().show(_rsds, null);
+ restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
+
+ _currentSqlLblCtrl.reInit(_rsds.currentRowCount(), _rsds.areAllPossibleResultsOfSQLRead());
+ _queryInfoPanel.displayRowCount(_rsds.currentRowCount());
+
+ reInitOverview();
+
+ }
+ catch (DataSetException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
/**
* @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#clear()
*/
public void clear()
{
- if (_metaDataOutput != null)
- {
- _metaDataOutput.clear();
- }
- if (_resultSetOutput != null)
- {
- _resultSetOutput.getDataSetViewer().clear();
- }
- _exInfo = null;
- _currentSqlLbl.setText("");
- _sql = "";
+ closeTab();
}
/**
@@ -320,15 +369,38 @@
return title.substring(0, 15);
}
- /**
- * @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#closeTab()
- */
- public void closeTab()
- {
- add(_tabResultTabs, BorderLayout.CENTER);
- _sqlResultExecuterPanelFacade.closeResultTab(this);
- }
+ public void closeTab()
+ {
+ if(_tabIsClosing)
+ {
+ return;
+ }
+ try
+ {
+ _tabIsClosing = true;
+
+ if (_metaDataOutput != null)
+ {
+ _metaDataOutput.clear();
+ }
+ if (_resultSetOutput != null)
+ {
+ _resultSetOutput.getDataSetViewer().clear();
+ }
+ _exInfo = null;
+ _currentSqlLblCtrl.clear();
+ _sql = "";
+
+ _sqlResultExecuterPanelFacade.closeResultTab(this);
+ _rsds.closeStatementAndResultSet();
+ }
+ finally
+ {
+ _tabIsClosing = false;
+ }
+ }
+
/**
* @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#returnToTabbedPane()
*/
@@ -381,13 +453,11 @@
// _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer);
_resultSetOutput.replaceDataSetViewer(dataSetViewer);
- // SCROLL
- // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- // _resultSetSp.setRowHeader(null);
-
_rsds.resetCursor();
_resultSetOutput.getDataSetViewer().show(_rsds, null);
+ initContinueReadChannel(_resultSetOutput);
+
restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
}
else
@@ -406,16 +476,12 @@
TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator, new DefaultDataModelImplementationDetails(_session));
- // _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer);
_resultSetOutput.replaceDataSetViewer(dataSetViewer);
- // SCROLL
- // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- // _resultSetSp.setRowHeader(null);
-
_rsds.resetCursor();
_resultSetOutput.getDataSetViewer().show(_rsds, null);
+ initContinueReadChannel(_resultSetOutput);
restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
}
@@ -447,7 +513,6 @@
private void createGUI()
{
- // final Resources rsrc = _session.getApplication().getResources();
setLayout(new BorderLayout());
int sqlResultsTabPlacement = _session.getProperties().getSQLResultsTabPlacement();
@@ -456,13 +521,16 @@
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayout(1, 3, 0, 0));
+
+ panel2.add(_readMoreResultsHandler.getLoadingLabel());
+
panel2.add(new TabButton(new RerunAction(_session.getApplication())));
panel2.add(new TabButton(new FindInResultAction(_session.getApplication())));
panel2.add(new TabButton(new CreateResultTabFrameAction(_session.getApplication())));
panel2.add(new TabButton(new CloseAction()));
panel1.setLayout(new BorderLayout());
panel1.add(panel2, BorderLayout.EAST);
- panel1.add(_currentSqlLbl, BorderLayout.CENTER);
+ panel1.add(_currentSqlLblCtrl.getLabel(), BorderLayout.CENTER);
add(panel1, BorderLayout.NORTH);
add(_tabResultTabs, BorderLayout.CENTER);
@@ -492,6 +560,17 @@
_tabResultTabs.addTab(infoTabTitle, sp);
+ reInitOverview();
+
+ }
+
+ private void reInitOverview()
+ {
+ if(OverviewCtrl.isOverviewPanel(_tabResultTabs.getComponentAt(_tabResultTabs.getTabCount()-1)))
+ {
+ _tabResultTabs.removeTabAt(_tabResultTabs.getTabCount()-1);
+ }
+
final int overViewIx = _tabResultTabs.getTabCount();
final OverviewCtrl ctrl = new OverviewCtrl(_session);
_tabResultTabs.addTab(ctrl.getTitle(), ctrl.getPanel());
@@ -507,9 +586,8 @@
}
}
});
+ }
- }
-
private class CloseAction extends SquirrelAction
{
CloseAction()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -4,10 +4,7 @@
import net.sourceforge.squirrel_sql.client.session.*;
import net.sourceforge.squirrel_sql.client.session.event.ISQLExecutionListener;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableTableModel;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetMetaDataDataSet;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
import net.sourceforge.squirrel_sql.fw.sql.SQLExecutionException;
@@ -17,7 +14,6 @@
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-import java.sql.ResultSet;
import java.sql.SQLWarning;
import java.text.NumberFormat;
import java.util.ArrayList;
@@ -389,7 +385,7 @@
_session.showMessage(msg);
}
- public void sqlResultSetAvailable(ResultSet rs, SQLExecutionInfo info, IDataSetUpdateableTableModel model)
+ public void sqlResultSetAvailable(ResultSetWrapper rs, SQLExecutionInfo info, IDataSetUpdateableTableModel model)
throws DataSetException
{
// i18n[SQLResultExecuterPanel.outputStatus=Building output...]
@@ -404,14 +400,14 @@
ResultSetMetaDataDataSet rsmdds = null;
if (props.getShowResultsMetaData())
{
- rsmdds = new ResultSetMetaDataDataSet(rs);
+ rsmdds = new ResultSetMetaDataDataSet(rs.getResultSet());
}
DialectType dialectType =
DialectFactory.getDialectType(_session.getMetaData());
// rsds.setContentsTabResultSet() reads the result set. So results processing on the DB is over
// and this time is measured. None is interested in the time that it takes us to render Swing tables ...
- info.resultsProcessingComplete(rsds.setContentsTabResultSet(rs, null, dialectType));
+ info.resultsProcessingComplete(rsds.setSqlExecutionTabResultSet(rs, null, dialectType));
_executionHandlerListener.addResultsTab(info, rsds, rsmdds, model, _resultTabToReplace);
@@ -421,8 +417,7 @@
* the GC can clean them.
*/
rsds = null;
- }
-
+ }
}
public void sqlExecutionWarning(SQLWarning warn)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLPanel.java 2012-11-21 21:29:15 UTC (rev 6721)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLPanel.java 2012-12-22 20:01:55 UTC (rev 6722)
@@ -42,7 +42,6 @@
import javax.swing.Box;
import javax.swing.ImageIcon;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
@@ -52,8 +51,6 @@
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
import javax.swing.event.EventListenerList;
import javax.swing.plaf.SplitPaneUI;
import javax.swing.plaf.basic.BasicSplitPaneUI;
@@ -72,9 +69,10 @@
import net.sourceforge.squirrel_sql.client.session.event.SQLExecutionAdapter;
import net.sourceforge.squirrel_sql.client.session.event.SQLPanelEvent;
import net.sourceforge.squirrel_sql.client.session.event.SQLResultExecuterTabEvent;
+import net.sourceforge.squirrel_sql.client.session.properties.ResultLimitAndReadOnPanelSmallPanel;
+import net.sourceforge.squirrel_sql.client.session.properties.SQLResultConfigCtrl;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.gui.FontInfo;
-import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
import net.sourceforge.squirrel_sql.fw.gui.MemoryComboBox;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -88,8 +86,6 @@
*/
public class SQLPanel extends JPanel
{
- private static final long serialVersionUID = 1L;
-
/** Logger for this class. */
private static final ILogger s_log = LoggerController.createLogger(SQLPanel.class);
@@ -110,13 +106,11 @@
transient private ISession _session;
private SQLHistoryComboBox _sqlCombo;
- transient private ISQLEntryPanel _sqlEntry;
- private JCheckBox _limitRowsChk;
- private IntegerField _nbrRows = new IntegerField();
+ private ISQLEntryPanel _sqlEntry;
- transient private SqlComboListener _sqlComboListener = new SqlComboListener();
- transient private MyPropertiesListener _propsListener;
+ private SqlComboListener _sqlComboListener = new SqlComboListener();
+ private MyPropertiesListener _propsListener;
/** Each tab is a <TT>ResultTab</TT> showing the results of a query. */
// private JTabbedPane _tabbedResultsPanel;
@@ -178,8 +172,10 @@
transient private SQLPanel.SQLExecutorHistoryListener _sqlExecutorHistoryListener = new SQLExecutorHistoryListener();
private ArrayList<SqlPanelListener> _sqlPanelListeners = new ArrayList<SqlPanelListener>();
private IUndoHandler _undoHandler;
+ private ResultLimitAndReadOnPanelSmallPanel _resultLimitAndReadOnPanelSmallPanel = new ResultLimitAndReadOnPanelSmallPanel();
+
/**
* Ctor.
*
@@ -199,6 +195,7 @@
_sqlExecPanel.addSQLExecutionListener(_sqlExecutorHistoryListener);
addExecutor(_sqlExecPanel);
_panelAPI = new SQLPanelAPI(this);
+ _resultLimitAndReadOnPanelSmallPanel.loadData(session.getProperties());
}
/**
@@ -700,15 +697,24 @@
if (propName == null || propName.equals(SessionProperties.IPropertyNames.SQL_LIMIT_ROWS))
{
- _limitRowsChk.setSelected(props.getSQLLimitRows());
+ _resultLimitAndReadOnPanelSmallPanel.propsChanged(props);
}
- if (propName == null
- || propName.equals(SessionProperties.IPropertyNames.SQL_NBR_ROWS_TO_SHOW))
+ if (propName == null || propName.equals(SessionProperties.IPropertyNames.SQL_NBR_ROWS_TO_SHOW))
{
- _nbrRows.setInt(props.getSQLNbrRowsToShow());
+ _resultLimitAndReadOnPanelSmallPanel.propsChanged(props);
}
+ if (propName == null || propName.equals(SessionProperties.IPropertyNames.SQL_READ_ON))
+ {
+ _resultLimitAndReadOnPanelSmallPanel.propsChanged(props);
+ }
+
+ if (propName == null || propName.equals(SessionProperties.IPropertyNames.SQL_READ_ON_BLOCK_SIZE))
+ {
+ _resultLimitAndReadOnPanelSmallPanel.propsChanged(props);
+ }
+
if (propName == null || propName.equals(SessionProperties.IPropertyNames.FONT_INFO))
{
FontInfo fi = props.getFontInfo();
@@ -792,7 +798,6 @@
setLayout(new BorderLayout());
- _nbrRows.setColumns(8);
final SessionProperties props = _session.getProperties();
_sqlCombo = new SQLHistoryComboBox(props.getSQLShareHistory());
@@ -811,13 +816,7 @@
box.add(new CopyLastButton(app));
box.add(new ShowHistoryButton(app));
box.add(Box.createHorizontalStrut(10));
- // i18n[SQLPanel.limitrowscheckbox.hint=Limit rows: ]
- String hint =
- s_stringMgr.getString("SQLPanel.limitrowscheckbox.label");
- _limitRowsChk = new JCheckBox(hint);
- box.add(_limitRowsChk);
- box.add(Box.createHorizontalStrut(5));
- box.add(_nbrRows);
+ box.add(_resultLimitAndReadOnPanelSmallPanel);
pnl.add(box, BorderLayout.EAST);
add(pnl, BorderLayout.NORTH);
}
@@ -842,8 +841,6 @@
add(_splitPane, BorderLayout.CENTER);
_sqlCombo.addActionListener(_sqlComboListener);
- _limitRowsChk.addChangeListener(new LimitRowsCheckBoxListener());
- _nbrRows.getDocument().addDocumentListener(new LimitRowsTextBoxListener());
// Set focus to the SQL entry panel.
SwingUtilities.invokeLater(new Runnable()
@@ -1037,70 +1034,9 @@
// }
}
- private class LimitRowsCheckBoxListener implements ChangeListener
- {
- public void stateChanged(ChangeEvent evt)
- {
- if (_propsListener != null)
- {
- _propsListener.stopListening();
- }
- try
- {
- final boolean limitRows = ((JCheckBox)evt.getSource()).isSelected();
- _nbrRows.setEnabled(limitRows);
- _session.getProperties().setSQLLimitRows(limitRows);
- }
- finally
- {
- if (_propsListener != null)
- {
- _propsListener.startListening();
- }
- }
- }
- }
- private class LimitRowsTextBoxListener implements DocumentListener
+ private class CopyLastButton extends JButton
{
- public void insertUpdate(DocumentEvent evt)
- {
- updateProperties(evt);
- }
-
- public void changedUpdate(DocumentEvent evt)
- {
- updateProperties(evt);
- }
-
- public void removeUpdate(DocumentEvent evt)
- {
- updateProperties(evt);
- }
- @SuppressWarnings("unused")
- private void updateProperties(DocumentEvent evt)
- {
- if (_propsListener != null)
- {
- _propsListener.stopListening();
- }
- try
- {
- _session.getProperties().setSQLNbrRowsToShow(_nbrRows.getInt());
- }
- finally
- {
- if (_propsListener != null)
- {
- _propsListener.startListening();
- }
- }
- }
- }
-
-
- private class CopyLastButton extends JButton
- {
private static final long serialVersionUID = 1L;
CopyLastButton(IApplication app)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/s...
[truncated message content] |
|
From: <ger...@us...> - 2012-11-21 21:29:21
|
Revision: 6721
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6721&view=rev
Author: gerdwagner
Date: 2012-11-21 21:29:15 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Result table search --> clean up / bug fix
Modified Paths:
--------------
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
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/EscapeAction.java
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-11-20 22:05:52 UTC (rev 6720)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-11-21 21:29:15 UTC (rev 6721)
@@ -156,13 +156,15 @@
}
};
+ EscapeAction escapeAction = new EscapeAction(_dataSetFindPanel.btnUnhighlightResult, _dataSetFindPanel.btnHideFindPanel);
+
JComponent comp = (JComponent) _dataSetFindPanel.cboString.getEditor().getEditorComponent();
comp.registerKeyboardAction(findNextAction, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), JComponent.WHEN_FOCUSED);
comp.registerKeyboardAction(findNextAction, KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0, false), JComponent.WHEN_FOCUSED);
comp.registerKeyboardAction(findPrevAction, KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.SHIFT_DOWN_MASK, false), JComponent.WHEN_FOCUSED);
- comp.registerKeyboardAction(unhighlightAction, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false), JComponent.WHEN_FOCUSED);
+ comp.registerKeyboardAction(escapeAction, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false), JComponent.WHEN_FOCUSED);
}
private void onFind(boolean next)
@@ -194,6 +196,8 @@
{
try
{
+ ensureFindService();
+
List<Object[]> allRows = _findService.getRowsForIndexes(_trace.getRowsFound());
ColumnDisplayDefinition[] columnDisplayDefinitions = _findService.getColumnDisplayDefinitions();
@@ -230,6 +234,7 @@
private void clearFind()
{
_trace.clear();
+ ensureFindService();
_findService.repaintAll();
_tableTraverser.reset();
}
@@ -238,30 +243,9 @@
{
checkDataSetViewerPanel();
- if(null == _findService)
- {
- _findService = _dataSetViewerTablePanel.createFindService();
+ ensureFindService();
- _findService.setFindServiceCallBack(new FindServiceCallBack()
- {
- @Override
- public FindMarkColor getBackgroundColor(int viewRow, int viewColumn)
- {
- return onGetBackgroundColor(viewRow, viewColumn);
- }
- @Override
- public void tableCellStructureChanged()
- {
- clearFind();
- }
- });
-
- _tableTraverser.setFindService(_findService);
-
- }
-
-
String searchString = "" + _dataSetFindPanel.cboString.getEditor().getItem();
@@ -326,8 +310,35 @@
}
+ private FindService ensureFindService()
+ {
+ if(null == _findService)
+ {
+ _findService = _dataSetViewerTablePanel.createFindService();
+ _findService.setFindServiceCallBack(new FindServiceCallBack()
+ {
+ @Override
+ public FindMarkColor getBackgroundColor(int viewRow, int viewColumn)
+ {
+ return onGetBackgroundColor(viewRow, viewColumn);
+ }
+ @Override
+ public void tableCellStructureChanged()
+ {
+ clearFind();
+ }
+ });
+
+ _tableTraverser.setFindService(_findService);
+
+ }
+
+ return _findService;
+ }
+
+
private void checkDataSetViewerPanel()
{
if(null == _dataSetViewerTablePanel)
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-11-20 22:05:52 UTC (rev 6720)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java 2012-11-21 21:29:15 UTC (rev 6721)
@@ -6,6 +6,8 @@
import javax.swing.*;
import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
public class DataSetViewerFindDecorator
{
@@ -43,16 +45,20 @@
};
_dataSetFindPanelController = new DataSetFindPanelController(messageHandler, dataSetFindPanelListener);
- _split.setLeftComponent(_dataSetFindPanelController.getPanel());
+ _dataSetFindPanelController.setDataSetViewerTablePanel((DataSetViewerTablePanel) _dataSetViewer);
+ _split.setLeftComponent(new NullPanel());
- if (_dataSetViewer instanceof DataSetViewerTablePanel)
+ _split.addComponentListener(new ComponentAdapter()
{
- _dataSetFindPanelController.setDataSetViewerTablePanel((DataSetViewerTablePanel) _dataSetViewer);
- }
- else
- {
- _split.setLeftComponent(new JPanel());
- }
+ @Override
+ public void componentResized(ComponentEvent e)
+ {
+ if(_split.getLeftComponent() instanceof NullPanel)
+ {
+ _split.setDividerLocation(0);
+ }
+ }
+ });
if (putTableInScrollpane)
@@ -91,11 +97,13 @@
_findPanelOpen = !_findPanelOpen;
if (_findPanelOpen)
{
+ _split.setLeftComponent(_dataSetFindPanelController.getPanel());
_split.setDividerLocation(_dataSetFindPanelController.getPanel().getPreferredSize().height);
_dataSetFindPanelController.focusTextField();
}
else
{
+ _split.setLeftComponent(new NullPanel());
_split.setDividerLocation(0);
_dataSetFindPanelController.wasHidden();
}
@@ -125,4 +133,15 @@
_dataSetFindPanelController.setDataSetViewerTablePanel(null);
}
}
+
+ private static class NullPanel extends JPanel
+ {
+ private NullPanel()
+ {
+ setPreferredSize(new Dimension(0,0));
+ setSize(new Dimension(0, 0));
+ setMaximumSize(new Dimension(0, 0));
+ }
+ }
+
}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/EscapeAction.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/EscapeAction.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/EscapeAction.java 2012-11-21 21:29:15 UTC (rev 6721)
@@ -0,0 +1,48 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class EscapeAction extends AbstractAction
+{
+ private JButton _btnUnhighlightResult;
+ private JButton _btnHideFindPanel;
+ private Timer _timer;
+ private boolean _hitLately;
+
+ public EscapeAction(JButton btnUnhighlightResult, JButton btnHideFindPanel)
+ {
+ super("DataSetFind.EscapeAction");
+ _btnUnhighlightResult = btnUnhighlightResult;
+ _btnHideFindPanel = btnHideFindPanel;
+
+ _timer = new Timer(1000, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ _hitLately = false;
+ }
+ });
+
+ _timer.setRepeats(false);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ if(_hitLately)
+ {
+ _btnHideFindPanel.doClick();
+ _timer.stop();
+ _hitLately = false;
+ }
+ else
+ {
+ _btnUnhighlightResult.doClick();
+ _timer.restart();
+ _hitLately = true;
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-11-20 22:06:00
|
Revision: 6720
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6720&view=rev
Author: gerdwagner
Date: 2012-11-20 22:05:52 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Result table search --> completed
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.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-11-17 20:58:32 UTC (rev 6719)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-11-20 22:05:52 UTC (rev 6720)
@@ -567,6 +567,7 @@
@Override
public void toggleShowFindPanel()
{
+ _tabResultTabs.setSelectedIndex(0);
if(false == _resultSetOutput.toggleShowFindPanel())
{
_session.getApplication().getMessageHandler().showWarningMessage(s_stringMgr.getString("ResultTab.tableSearchNotSupported"));
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-11-17 20:58:32 UTC (rev 6719)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-11-20 22:05:52 UTC (rev 6720)
@@ -8,6 +8,8 @@
Enhancements:
+Find function for SQL result tables.
+
Closing or reconnecting Sessions caused SQuirreL to hang when the JDBC driver's connection close method didn't return.
Now closing timeouts after 2 seconds.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java 2012-11-17 20:58:32 UTC (rev 6719)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java 2012-11-20 22:05:52 UTC (rev 6720)
@@ -13,7 +13,7 @@
JComboBox cboMatchType;
JCheckBox chkCaseSensitive;
- JTextField txtString;
+ JComboBox cboString;
JButton btnDown;
JButton btnUp;
@@ -40,8 +40,9 @@
add(chkCaseSensitive, gbc);
gbc = new GridBagConstraints(2,0,1,1,1,0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5), 0,0);
- txtString = new JTextField();
- add(txtString, gbc);
+ cboString = new JComboBox();
+ cboString.setEditable(true);
+ add(cboString, gbc);
LibraryResources rsrc = new LibraryResources();
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-11-17 20:58:32 UTC (rev 6719)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-11-20 22:05:52 UTC (rev 6720)
@@ -6,18 +6,20 @@
import javax.swing.*;
import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
+import java.awt.event.*;
+import java.util.ArrayList;
import java.util.List;
+import java.util.prefs.Preferences;
public class DataSetFindPanelController
{
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DataSetFindPanelController.class);
+ private static final String PREF_KEY_DATASETFIND_TABLESEARCH_STRPREF = "SquirrelSQL.DataSetFind.tableSearch.StrPref_";
+ private static final int MAX_HIST_LENGTH = 10;
+
private DataSetFindPanel _dataSetFindPanel;
private TableTraverser _tableTraverser = new TableTraverser();
@@ -115,8 +117,66 @@
}
});
+ for (int i = 0; i < MAX_HIST_LENGTH; i++)
+ {
+ String item = Preferences.userRoot().get(PREF_KEY_DATASETFIND_TABLESEARCH_STRPREF + i, null);
+ if (null != item)
+ {
+ _dataSetFindPanel.cboString.addItem(item);
+ }
+ }
+ _dataSetFindPanel.cboString.getEditor().setItem(null);
+
+ initKeyStrokes();
}
+ private void initKeyStrokes()
+ {
+ Action findNextAction = new AbstractAction("DataSetFind.FindNext")
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onFind(true);
+ }
+ };
+
+ Action findPrevAction = new AbstractAction("DataSetFind.FindPrev")
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onFind(false);
+ }
+ };
+
+ Action unhighlightAction = new AbstractAction("DataSetFind.Unhighlight")
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ _dataSetFindPanel.btnUnhighlightResult.doClick();
+ }
+ };
+
+ JComponent comp = (JComponent) _dataSetFindPanel.cboString.getEditor().getEditorComponent();
+ comp.registerKeyboardAction(findNextAction, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), JComponent.WHEN_FOCUSED);
+ comp.registerKeyboardAction(findNextAction, KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0, false), JComponent.WHEN_FOCUSED);
+
+ comp.registerKeyboardAction(findPrevAction, KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.SHIFT_DOWN_MASK, false), JComponent.WHEN_FOCUSED);
+
+ comp.registerKeyboardAction(unhighlightAction, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false), JComponent.WHEN_FOCUSED);
+ }
+
+ private void onFind(boolean next)
+ {
+ if (next)
+ {
+ _dataSetFindPanel.btnDown.doClick();
+ }
+ else
+ {
+ _dataSetFindPanel.btnUp.doClick();
+ }
+ }
+
private void onShowRowsFoundInTable()
{
Window parent = SwingUtilities.windowForComponent(_dataSetFindPanel);
@@ -202,7 +262,7 @@
}
- String searchString = _dataSetFindPanel.txtString.getText();
+ String searchString = "" + _dataSetFindPanel.cboString.getEditor().getItem();
if(false == StringUtils.equals(searchString, _currentSearchString))
@@ -219,6 +279,10 @@
return;
}
+ addToComboList(_currentSearchString);
+
+
+
boolean matchFound = false;
for(int i=0; i < _tableTraverser.getCellCount(); ++i)
{
@@ -315,13 +379,12 @@
private FindMarkColor onGetBackgroundColor(int viewRow, int viewColumn)
{
- String searchString = _dataSetFindPanel.txtString.getText();
+ String searchString = "" + _dataSetFindPanel.cboString.getEditor().getItem();
if(null == searchString)
{
return null;
}
-
if(_trace.contains(viewRow, viewColumn))
{
if (_trace.isCurrent(viewRow, viewColumn))
@@ -340,4 +403,46 @@
}
+ private void addToComboList(String searchString)
+ {
+ for (int i = 0; i < _dataSetFindPanel.cboString.getItemCount(); i++)
+ {
+ if(searchString.equals(_dataSetFindPanel.cboString.getItemAt(i)))
+ {
+ _dataSetFindPanel.cboString.removeItemAt(i);
+ }
+ }
+ ((DefaultComboBoxModel)_dataSetFindPanel.cboString.getModel()).insertElementAt(searchString, 0);
+
+
+ ArrayList itemsToRemove = new ArrayList();
+ for (int i = 0; i < _dataSetFindPanel.cboString.getItemCount(); i++)
+ {
+ if (MAX_HIST_LENGTH > i)
+ {
+ Preferences.userRoot().put(PREF_KEY_DATASETFIND_TABLESEARCH_STRPREF + i, "" + _dataSetFindPanel.cboString.getItemAt(i));
+ }
+ else
+ {
+ itemsToRemove.add(_dataSetFindPanel.cboString.getItemAt(i));
+ }
+ }
+
+ for (Object item : itemsToRemove)
+ {
+ _dataSetFindPanel.cboString.removeItem(item);
+ }
+
+ _dataSetFindPanel.cboString.setSelectedIndex(0);
+
+ }
+
+ public void focusTextField()
+ {
+ _dataSetFindPanel.cboString.getEditor().getEditorComponent().requestFocus();
+
+ }
+
+
+
}
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-11-17 20:58:32 UTC (rev 6719)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java 2012-11-20 22:05:52 UTC (rev 6720)
@@ -92,6 +92,7 @@
if (_findPanelOpen)
{
_split.setDividerLocation(_dataSetFindPanelController.getPanel().getPreferredSize().height);
+ _dataSetFindPanelController.focusTextField();
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-11-17 20:58:39
|
Revision: 6719
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6719&view=rev
Author: gerdwagner
Date: 2012-11-17 20:58:32 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Bug fix: Tables cells that contained html where rendered incorrect. Now the plain html string is shown.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellRenderer.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-11-17 20:28:27 UTC (rev 6718)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-11-17 20:58:32 UTC (rev 6719)
@@ -48,6 +48,8 @@
Bug fixes:
+Tables cells that contained html where rendered incorrect. Now the plain html string is shown.
+
When schema info was refreshed (using F5) the SQL editor used to color tables as undefined (error red).
Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java 2012-11-17 20:28:27 UTC (rev 6718)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java 2012-11-17 20:58:32 UTC (rev 6719)
@@ -1,6 +1,5 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent;
-import java.awt.Component;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -13,12 +12,10 @@
import java.util.HashMap;
import javax.swing.DefaultCellEditor;
-import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
-import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
@@ -230,90 +227,9 @@
{
return new CellRenderer(getDataTypeObject(null, colDef));
}
-
- /**
- * The base component of a DefaultTableCellRenderer is a JLabel.
- * @author gwg
- */
- static private final class CellRenderer extends DefaultTableCellRenderer implements SquirrelTableCellRenderer
- {
- private static final long serialVersionUID = 1L;
- transient private final IDataTypeComponent _dataTypeObject;
- CellRenderer(IDataTypeComponent dataTypeObject)
- {
- super();
-
- _dataTypeObject = dataTypeObject;
- }
-
- /**
- *
- * Returns the default table cell renderer - overridden from DefaultTableCellRenderer.
- *
- * @param table the <code>JTable</code>
- * @param value the value to assign to the cell at
- * <code>[row, column]</code>
- * @param isSelected true if cell is selected
- * @param hasFocus true if cell has focus
- * @param row the row of the cell to render
- * @param column the column of the cell to render
- * @return the default table cell renderer
- */
- public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
-
- JLabel label = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-
- // if text cannot be edited in the cell but can be edited in
- // the popup, show that by changing the text colors.
- if (_dataTypeObject != null &&
- _dataTypeObject.isEditableInCell(value) == false &&
- _dataTypeObject.isEditableInPopup(value) == true) {
- // Use a CYAN background to indicate that the cell is
- // editable in the popup
- setBackground(SquirrelConstants.MULTI_LINE_CELL_COLOR);
- }
- else {
- // since the previous entry might have changed the color,
- // we need to reset the color back to default value for table cells,
- // taking into account whether the cell is selected or not.
- if (isSelected)
- setBackground(table.getSelectionBackground());
- else
- setBackground(table.getBackground());
- }
-
-
- return label;
- }
-
-
- public void setValue(Object value)
- {
- // default behavior if no DataType object is to use the
- // DefaultColumnRenderer with no modification.
- if (_dataTypeObject != null)
- super.setValue(_dataTypeObject.renderObject(value));
- else super.setValue(DefaultColumnRenderer.getInstance().renderObject(value));
- }
-
- public Object renderValue(Object value)
- {
- if (_dataTypeObject != null)
- {
- return _dataTypeObject.renderObject(value);
- }
- else
- {
- return DefaultColumnRenderer.getInstance().renderObject(value);
- }
- }
- }
-
-
- /**
+ /**
* Return true if the data type for the column may be edited
* within the table cell, false if not.
*/
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellRenderer.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellRenderer.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellRenderer.java 2012-11-17 20:58:32 UTC (rev 6719)
@@ -0,0 +1,90 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent;
+
+import net.sourceforge.squirrel_sql.fw.util.SquirrelConstants;
+
+import javax.swing.*;
+import javax.swing.table.DefaultTableCellRenderer;
+import java.awt.*;
+
+/**
+ * The base component of a DefaultTableCellRenderer is a JLabel.
+ * @author gwg
+ */
+public final class CellRenderer extends DefaultTableCellRenderer implements SquirrelTableCellRenderer
+{
+transient private final IDataTypeComponent _dataTypeObject;
+
+ CellRenderer(IDataTypeComponent dataTypeObject)
+ {
+ super();
+
+ _dataTypeObject = dataTypeObject;
+ }
+
+ /**
+ *
+ * Returns the default table cell renderer - overridden from DefaultTableCellRenderer.
+ *
+ * @param table the <code>JTable</code>
+ * @param value the value to assign to the cell at
+ * <code>[row, column]</code>
+ * @param isSelected true if cell is selected
+ * @param hasFocus true if cell has focus
+ * @param row the row of the cell to render
+ * @param column the column of the cell to render
+ * @return the default table cell renderer
+ */
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+
+ JLabel label = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+
+ // if text cannot be edited in the cell but can be edited in
+ // the popup, show that by changing the text colors.
+ if (_dataTypeObject != null &&
+ _dataTypeObject.isEditableInCell(value) == false &&
+ _dataTypeObject.isEditableInPopup(value) == true)
+ {
+ // Use a CYAN background to indicate that the cell is
+ // editable in the popup
+ setBackground(SquirrelConstants.MULTI_LINE_CELL_COLOR);
+ }
+ else
+ {
+ // since the previous entry might have changed the color,
+ // we need to reset the color back to default value for table cells,
+ // taking into account whether the cell is selected or not.
+ if (isSelected)
+ setBackground(table.getSelectionBackground());
+ else
+ setBackground(table.getBackground());
+ }
+
+ label.putClientProperty("html.disable", Boolean.TRUE);
+
+
+ return label;
+ }
+
+
+ public void setValue(Object value)
+ {
+ // default behavior if no DataType object is to use the
+ // DefaultColumnRenderer with no modification.
+ if (_dataTypeObject != null)
+ super.setValue(_dataTypeObject.renderObject(value));
+ else super.setValue(DefaultColumnRenderer.getInstance().renderObject(value));
+ }
+
+ public Object renderValue(Object value)
+ {
+ if (_dataTypeObject != null)
+ {
+ return _dataTypeObject.renderObject(value);
+ }
+ else
+ {
+ return DefaultColumnRenderer.getInstance().renderObject(value);
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6718
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6718&view=rev
Author: gerdwagner
Date: 2012-11-17 20:28:27 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Result table search --> More
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java
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-11-17 20:23:28 UTC (rev 6717)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-11-17 20:28:27 UTC (rev 6718)
@@ -8,6 +8,8 @@
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import java.util.List;
public class DataSetFindPanelController
@@ -70,7 +72,7 @@
@Override
public void actionPerformed(ActionEvent e)
{
- onUnhighlightResult();
+ clearFind();
}
});
@@ -95,6 +97,24 @@
}
});
+ _dataSetFindPanel.chkCaseSensitive.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ clearFind();
+ }
+ });
+
+ _dataSetFindPanel.cboMatchType.addItemListener(new ItemListener()
+ {
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ clearFind();
+ }
+ });
+
}
private void onShowRowsFoundInTable()
@@ -143,11 +163,11 @@
public void wasHidden()
{
- onUnhighlightResult();
+ clearFind();
}
- private void onUnhighlightResult()
+ private void clearFind()
{
_trace.clear();
_findService.repaintAll();
@@ -173,7 +193,7 @@
@Override
public void tableCellStructureChanged()
{
- onUnhighlightResult();
+ clearFind();
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6717
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6717&view=rev
Author: gerdwagner
Date: 2012-11-17 20:23:28 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
--> Added remove to main tab button
--> Empty windows are closed
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java 2012-11-17 03:28:37 UTC (rev 6716)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java 2012-11-17 20:23:28 UTC (rev 6717)
@@ -220,9 +220,13 @@
cleanUpOnMove(removeTabHandelResult);
DockTabDesktopPaneHolder mainDockTabDesktopHolder = _app.getMultipleWindowsHandler().getMainDockTabDesktopHolder();
- ArrayList<SmallTabButton> externalButtons = removeTabHandelResult.getRemovedButtonTabComponent().getExternalButtons();
+ ButtonTabComponent removedButtonTabComponent = removeTabHandelResult.getRemovedButtonTabComponent();
- mainDockTabDesktopHolder.addTabWidget(tabHandle.getWidget(), externalButtons);
+ if (null != removedButtonTabComponent)
+ {
+ ArrayList<SmallTabButton> externalButtons = removedButtonTabComponent.getExternalButtons();
+ mainDockTabDesktopHolder.addTabWidget(tabHandle.getWidget(), externalButtons);
+ }
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-11-17 03:28:45
|
Revision: 6716
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6716&view=rev
Author: gerdwagner
Date: 2012-11-17 03:28:37 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
--> Added remove to main tab button
--> Empty windows are closed
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/DesktopContainerFactory.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneListener.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach-small_revert.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -68,11 +68,11 @@
DockTabDesktopPaneHolder sourceDesktopPaneHolder = _app.getMultipleWindowsHandler().getDockTabDesktopPaneOfTabbedPane(_dnDTabbedPaneData.getTabbedPane());
- RemoveTabHandelResult moveTabHandelResult = sourceDesktopPaneHolder.getDockTabDesktopPane().removeTabHandel(_dnDTabbedPaneData.getDragTabIndex());
+ RemoveTabHandelResult moveTabHandelResult = sourceDesktopPaneHolder.removeTabHandel(_dnDTabbedPaneData.getDragTabIndex());
DockTabDesktopPaneHolder targetDesktopPaneHolder = _app.getMultipleWindowsHandler().getDockTabDesktopPaneOfTabbedPane(targetTabbedPane);
- targetDesktopPaneHolder.getDockTabDesktopPane().addTabWidgetAt(moveTabHandelResult.getTabHandle().getWidget(), targetTabIndex, moveTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
+ targetDesktopPaneHolder.addTabWidgetAt(moveTabHandelResult.getTabHandle().getWidget(), targetTabIndex, moveTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
sourceDesktopPaneHolder.tabDragedAndDroped();
targetDesktopPaneHolder.tabDragedAndDroped();
@@ -82,7 +82,7 @@
{
for (JTabbedPane tabbedPane : _listeners.keySet())
{
- if(dockTabDesktopPaneHolder.getDockTabDesktopPane().isMyTabbedPane(tabbedPane))
+ if(dockTabDesktopPaneHolder.isMyTabbedPane(tabbedPane))
{
_listeners.remove(tabbedPane);
break;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -1,12 +1,16 @@
package net.sourceforge.squirrel_sql.client;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.TabWidget;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPaneHolder;
import net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane.OutwardDndTabbedPaneChanel;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.RemoveTabHandelResult;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.SmallTabButton;
import javax.swing.*;
import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
+import java.util.ArrayList;
import java.util.HashSet;
public class MultipleWindowsHandler
@@ -16,6 +20,7 @@
private DesktopTabbedPaneOutwardDndChanel _outwardDndTabbedPaneChanel;
private Application _app;
+ private DockTabDesktopPaneHolder _mainDockTabDesktopPaneHolder;
public MultipleWindowsHandler(Application app)
{
@@ -45,14 +50,8 @@
public void registerMainFrame(final DockTabDesktopPane mainDesktop)
{
-
- final DockTabDesktopPaneHolder dockTabDesktopPaneHolder = new DockTabDesktopPaneHolder()
+ _mainDockTabDesktopPaneHolder = new DockTabDesktopPaneHolder()
{
- @Override
- public DockTabDesktopPane getDockTabDesktopPane()
- {
- return mainDesktop;
- }
@Override
public void setSelected(boolean b)
@@ -65,11 +64,35 @@
{
onTabDragedAndDroped(mainDesktop);
}
+
+ @Override
+ public void addTabWidgetAt(TabWidget widget, int tabIndex, ArrayList<SmallTabButton> externalButtons)
+ {
+ mainDesktop.addTabWidgetAt(widget, tabIndex, externalButtons);
+ }
+
+ @Override
+ public RemoveTabHandelResult removeTabHandel(int tabIndex)
+ {
+ return mainDesktop.removeTabHandel(tabIndex);
+ }
+
+ @Override
+ public boolean isMyTabbedPane(JTabbedPane tabbedPane)
+ {
+ return mainDesktop.isMyTabbedPane(tabbedPane);
+ }
+
+ @Override
+ public void addTabWidget(TabWidget widget, ArrayList<SmallTabButton> externalButtons)
+ {
+ mainDesktop.addTabWidgetAt(widget, mainDesktop.getTabCount() , externalButtons);
+ }
};
- _dockTabDesktopPaneHolders.add(dockTabDesktopPaneHolder);
+ _dockTabDesktopPaneHolders.add(_mainDockTabDesktopPaneHolder);
- _curSelectedDockTabDesktopPaneHolder = dockTabDesktopPaneHolder;
+ _curSelectedDockTabDesktopPaneHolder = _mainDockTabDesktopPaneHolder;
_app.getMainFrame().addWindowFocusListener(new WindowFocusListener()
@@ -77,7 +100,7 @@
@Override
public void windowGainedFocus(WindowEvent e)
{
- selectDesktop(dockTabDesktopPaneHolder);
+ selectDesktop(_mainDockTabDesktopPaneHolder);
}
@Override
@@ -125,7 +148,7 @@
{
for (DockTabDesktopPaneHolder dockTabDesktopPaneHolder : _dockTabDesktopPaneHolders)
{
- if(dockTabDesktopPaneHolder.getDockTabDesktopPane().isMyTabbedPane(tabbedPane))
+ if(dockTabDesktopPaneHolder.isMyTabbedPane(tabbedPane))
{
return dockTabDesktopPaneHolder;
}
@@ -133,4 +156,9 @@
throw new IllegalArgumentException("Could not find DockTabDesktopPane for TabbedPane " + tabbedPane);
}
+
+ public DockTabDesktopPaneHolder getMainDockTabDesktopHolder()
+ {
+ return _mainDockTabDesktopPaneHolder;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/DesktopContainerFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/DesktopContainerFactory.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/DesktopContainerFactory.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -1,7 +1,6 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ScrollableDesktopPane;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
import java.awt.*;
@@ -12,7 +11,7 @@
{
if (app.getDesktopStyle().isDockTabStyle())
{
- return new DockTabDesktopPane(app, true);
+ return new DockTabDesktopPane(app, true, null);
}
else
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -109,6 +109,19 @@
return ret;
}
+ public SmallTabButton findSmallTabButtonByUserObject(Object userObject)
+ {
+ for (Component cp : _pnlSmallTabButtons.getComponents())
+ {
+ SmallTabButton stb = (SmallTabButton) cp;
+ if(userObject == stb.getUserObject())
+ {
+ return stb;
+ }
+ }
+ return null;
+ }
+
private static class CloseTabButton extends SmallTabButton
{
private CloseTabButton()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -37,6 +37,7 @@
private IApplication _app;
private boolean _belongsToMainApplicationWindow;
+ private DockTabDesktopPaneListener _dockTabDesktopPaneListener;
private JPanel _pnlButtons = new JPanel();
@@ -59,10 +60,11 @@
private ScrollableTabHandler _scrollableTabHandler;
- public DockTabDesktopPane(IApplication app, boolean belongsToMainApplicationWindow)
+ public DockTabDesktopPane(IApplication app, boolean belongsToMainApplicationWindow, DockTabDesktopPaneListener dockTabDesktopPaneListener)
{
_app = app;
_belongsToMainApplicationWindow = belongsToMainApplicationWindow;
+ _dockTabDesktopPaneListener = dockTabDesktopPaneListener;
_tabbedPane = new DesktopTabbedPane(_app);
@@ -169,7 +171,7 @@
addTabWidgetAt(widget, _tabbedPane.getTabCount(), new ArrayList<SmallTabButton>());
}
- public void addTabWidgetAt(TabWidget widget, int index, ArrayList<SmallTabButton> externalButtons)
+ public TabHandle addTabWidgetAt(TabWidget widget, int index, ArrayList<SmallTabButton> externalButtons)
{
final TabHandle tabHandle = new TabHandle(widget, this);
((TabDelegate) widget.getDelegate()).setTabHandle(tabHandle);
@@ -182,14 +184,18 @@
ButtonTabComponent btc = (ButtonTabComponent) _tabbedPane.getTabComponentAt(tabIx);
- btc.getClosebutton().addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ btc.getClosebutton().addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
removeTab(tabHandle, e, TabClosingMode.CLOSE_BUTTON);
}
});
- btc.getToWindowButton().addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ btc.getToWindowButton().addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
onToWindow(tabHandle);
}
});
@@ -205,6 +211,8 @@
tabHandle.fireAdded(_belongsToMainApplicationWindow);
_tabbedPane.setSelectedIndex(tabIx);
_scrollableTabHandler.tabAdded();
+
+ return tabHandle;
}
@@ -227,7 +235,12 @@
RemoveTabHandelResult removeTabHandelResult = removeTabHandel(tabHandle);
- tabWindowController.getDockTabDesktopPane().addTabWidgetAt(tabHandle.getWidget(), 0, removeTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
+ tabWindowController.addTabWidgetAt(tabHandle.getWidget(), 0, removeTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
+
+ if (null != _dockTabDesktopPaneListener)
+ {
+ _dockTabDesktopPaneListener.tabWasRemoved(tabHandle);
+ }
}
public RemoveTabHandelResult removeTabHandel(int tabIndex)
@@ -236,7 +249,7 @@
return removeTabHandel(tabHandle);
}
- private RemoveTabHandelResult removeTabHandel(TabHandle tabHandle)
+ public RemoveTabHandelResult removeTabHandel(TabHandle tabHandle)
{
RemoveTabHandelResult ret = new RemoveTabHandelResult();
int tabIndex = getTabIndex(tabHandle);
@@ -654,4 +667,10 @@
selectedHandle._setSelected(b, true);
}
}
+
+ public int getTabCount()
+ {
+ return _tabHandles.size();
+ }
+
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -1,10 +1,21 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.TabWidget;
+
+import javax.swing.*;
+import java.util.ArrayList;
+
public interface DockTabDesktopPaneHolder
{
- DockTabDesktopPane getDockTabDesktopPane();
-
void setSelected(boolean b);
void tabDragedAndDroped();
+
+ void addTabWidgetAt(TabWidget widget, int tabIndex, ArrayList<SmallTabButton> externalButtons);
+
+ RemoveTabHandelResult removeTabHandel(int tabIndex);
+
+ boolean isMyTabbedPane(JTabbedPane tabbedPane);
+
+ void addTabWidget(TabWidget widget, ArrayList<SmallTabButton> externalButtons);
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneListener.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+
+public interface DockTabDesktopPaneListener
+{
+ public void tabWasRemoved(TabHandle tabHandle);
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -1,11 +1,5 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
-/**
- * Created with IntelliJ IDEA.
- * User: gerd
- * Date: 24.10.12
- * Time: 20:05
- */
public class RemoveTabHandelResult
{
private ButtonTabComponent _removedButtonTabComponent;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.TabWidget;
import net.sourceforge.squirrel_sql.client.gui.mainframe.SquirrelDesktopManager;
import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -8,9 +9,7 @@
import javax.swing.*;
import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowFocusListener;
+import java.awt.event.*;
import java.util.ArrayList;
public class TabWindowController implements DockTabDesktopPaneHolder
@@ -21,26 +20,38 @@
private final DockTabDesktopPane _dockTabDesktopPane;
private IApplication _app;
private final JMenu _mnuSession;
+ private final JFrame _tabWindowFrame;
+ private static class MoveTabBackToMainWinMarker {}
+
public TabWindowController(Point locationOnScreen, Dimension size, final IApplication app)
{
_app = app;
- JFrame f = new JFrame(_app.getMainFrame().getTitle() + " " +s_stringMgr.getString("docktabdesktop.TabWindowController.titlePostFix"));
+ _tabWindowFrame = new JFrame(_app.getMainFrame().getTitle() + " " +s_stringMgr.getString("docktabdesktop.TabWindowController.titlePostFix"));
- f.setLocation(locationOnScreen);
- f.setSize(size);
- f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ _tabWindowFrame.setLocation(locationOnScreen);
+ _tabWindowFrame.setSize(size);
+ _tabWindowFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- _dockTabDesktopPane = new DockTabDesktopPane(app, false);
+ DockTabDesktopPaneListener dockTabDesktopPaneListener = new DockTabDesktopPaneListener()
+ {
+ @Override
+ public void tabWasRemoved(TabHandle tabHandle)
+ {
+ onTabWasRemoved();
+ }
+ };
+
+ _dockTabDesktopPane = new DockTabDesktopPane(app, false, dockTabDesktopPaneListener);
_dockTabDesktopPane.setDesktopManager(new SquirrelDesktopManager(app));
- f.getContentPane().add(_dockTabDesktopPane);
+ _tabWindowFrame.getContentPane().add(_dockTabDesktopPane);
JMenuBar mnuBar = new JMenuBar();
_mnuSession = cloneMenu(app.getMainFrame().getSessionMenu());
mnuBar.add(_mnuSession);
- f.setJMenuBar(mnuBar);
+ _tabWindowFrame.setJMenuBar(mnuBar);
WindowFocusListener l = new WindowFocusListener()
{
@@ -55,17 +66,17 @@
{
}
};
- f.addWindowFocusListener(l);
+ _tabWindowFrame.addWindowFocusListener(l);
final ImageIcon icon = app.getResources().getIcon(SquirrelResources.IImageNames.APPLICATION_ICON);
if (icon != null)
{
- f.setIconImage(icon.getImage());
+ _tabWindowFrame.setIconImage(icon.getImage());
}
- f.addWindowListener(new WindowAdapter()
+ _tabWindowFrame.addWindowListener(new WindowAdapter()
{
@Override
public void windowClosing(WindowEvent e)
@@ -74,11 +85,24 @@
}
});
- f.setVisible(true);
+ _tabWindowFrame.setVisible(true);
}
+ private void onTabWasRemoved()
+ {
+ if(0 == _dockTabDesktopPane.getTabCount())
+ {
+ closeFrame();
+ }
+ }
+
private void onWindowClosing()
{
+ dispose();
+ }
+
+ private void dispose()
+ {
ArrayList<TabHandle> handels = _dockTabDesktopPane.getAllHandels();
TabHandle[] clone = handels.toArray(new TabHandle[handels.size()]);
for (TabHandle handel : clone)
@@ -91,12 +115,6 @@
@Override
- public DockTabDesktopPane getDockTabDesktopPane()
- {
- return _dockTabDesktopPane;
- }
-
- @Override
public void setSelected(boolean b)
{
_dockTabDesktopPane.setSelected(true);
@@ -156,4 +174,110 @@
return ret;
}
+
+ @Override
+ public void addTabWidgetAt(final TabWidget widget, int tabIndex, final ArrayList<SmallTabButton> externalButtons)
+ {
+
+ SmallTabButton btnMoveTabBackToMainWin = null;
+ for (SmallTabButton externalButton : externalButtons)
+ {
+ if(externalButton.getUserObject() == MoveTabBackToMainWinMarker.class)
+ {
+ btnMoveTabBackToMainWin = externalButton;
+ break;
+ }
+ }
+
+ ArrayList<SmallTabButton> buf = externalButtons;
+ if (null == btnMoveTabBackToMainWin)
+ {
+ buf = new ArrayList<SmallTabButton>();
+ String toolTipText = s_stringMgr.getString("docktabdesktop.TabWindowController.moveTabBackToMainWin");
+ ImageIcon icon = _app.getResources().getIcon(SquirrelResources.IImageNames.TAB_DETACH_SMALL_REVERT);
+ btnMoveTabBackToMainWin = new SmallTabButton(toolTipText, icon, MoveTabBackToMainWinMarker.class);
+ buf.add(btnMoveTabBackToMainWin);
+ buf.addAll(externalButtons);
+ }
+
+ final TabHandle tabHandle = _dockTabDesktopPane.addTabWidgetAt(widget, tabIndex, buf);
+
+ btnMoveTabBackToMainWin.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onMoveBackToMainWin(tabHandle);
+ }
+ });
+
+ }
+
+ private void onMoveBackToMainWin(TabHandle tabHandle)
+ {
+ RemoveTabHandelResult removeTabHandelResult = _dockTabDesktopPane.removeTabHandel(tabHandle);
+
+ cleanUpOnMove(removeTabHandelResult);
+
+ DockTabDesktopPaneHolder mainDockTabDesktopHolder = _app.getMultipleWindowsHandler().getMainDockTabDesktopHolder();
+ ArrayList<SmallTabButton> externalButtons = removeTabHandelResult.getRemovedButtonTabComponent().getExternalButtons();
+
+ mainDockTabDesktopHolder.addTabWidget(tabHandle.getWidget(), externalButtons);
+ }
+
+ @Override
+ public RemoveTabHandelResult removeTabHandel(int tabIndex)
+ {
+ RemoveTabHandelResult tabHandelResult = _dockTabDesktopPane.removeTabHandel(tabIndex);
+
+ cleanUpOnMove(tabHandelResult);
+
+ return tabHandelResult;
+ }
+
+ private void cleanUpOnMove(RemoveTabHandelResult tabHandelResult)
+ {
+ ButtonTabComponent removedButtonTabComponent = tabHandelResult.getRemovedButtonTabComponent();
+
+ SmallTabButton stb = null;
+
+ if (null != removedButtonTabComponent)
+ {
+ stb = removedButtonTabComponent.findSmallTabButtonByUserObject(MoveTabBackToMainWinMarker.class);
+ }
+
+ if (null != stb)
+ {
+ for (ActionListener actionListener : stb.getActionListeners())
+ {
+ stb.removeActionListener(actionListener);
+ }
+ removedButtonTabComponent.removeSmallTabButton(stb);
+ }
+
+ if(0 == _dockTabDesktopPane.getTabCount())
+ {
+ closeFrame();
+ }
+
+ }
+
+ private void closeFrame()
+ {
+ dispose();
+ _tabWindowFrame.setVisible(false);
+ _tabWindowFrame.dispose();
+ }
+
+ @Override
+ public boolean isMyTabbedPane(JTabbedPane tabbedPane)
+ {
+ return _dockTabDesktopPane.isMyTabbedPane(tabbedPane);
+ }
+
+ @Override
+ public void addTabWidget(TabWidget widget, ArrayList<SmallTabButton> externalButtons)
+ {
+ _dockTabDesktopPane.addTabWidgetAt(widget, _dockTabDesktopPane.getTabCount(), externalButtons);
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-11-17 03:28:37 UTC (rev 6716)
@@ -88,6 +88,7 @@
String TAB_DETACH = "tabDetach";
String TAB_DETACH_SMALL = "tabDetachSmall";
+ String TAB_DETACH_SMALL_REVERT = "tabDetachSmallRevert";
String AGG_COUNT = "aggCount";
String AGG_SUM = "aggSum";
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties 2012-11-17 03:28:37 UTC (rev 6716)
@@ -3,4 +3,6 @@
docktabdesktop.ButtonTabComponent.toolTip=Close this tab
docktabdesktop.ButtonTabComponent.detachButtonTooltip=Move tab to new window
-docktabdesktop.TabWindowController.titlePostFix=detached tab window
\ No newline at end of file
+docktabdesktop.TabWindowController.titlePostFix=detached tab window
+
+docktabdesktop.TabWindowController.moveTabBackToMainWin=Move tab back to main window
\ No newline at end of file
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach-small_revert.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach-small_revert.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-11-14 21:49:37 UTC (rev 6715)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-11-17 03:28:37 UTC (rev 6716)
@@ -73,6 +73,7 @@
tabDetach.image=tab-detach.png
tabDetachSmall.image=tab-detach-small.png
+tabDetachSmallRevert.image=tab-detach-small_revert.png
aggCount.image=aggcount.png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-11-14 21:49:43
|
Revision: 6715
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6715&view=rev
Author: gerdwagner
Date: 2012-11-14 21:49:37 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Closing or reconnecting Sessions caused SQuirreL to hang when the JDBC driver's connection close method didn't return.
Now closing timeouts after 2 seconds.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-11-14 21:48:33 UTC (rev 6714)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-11-14 21:49:37 UTC (rev 6715)
@@ -8,6 +8,9 @@
Enhancements:
+Closing or reconnecting Sessions caused SQuirreL to hang when the JDBC driver's connection close method didn't return.
+ Now closing timeouts after 2 seconds.
+
Function to detach/close a file while keeping its contents in the SQL editor. Accessible through Toolbar and tools pop up.
Hibernate Plugin:
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java 2012-11-14 21:48:33 UTC (rev 6714)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java 2012-11-14 21:49:37 UTC (rev 6715)
@@ -26,6 +26,7 @@
import java.sql.Statement;
import java.util.Calendar;
import java.util.Date;
+import java.util.concurrent.*;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
@@ -87,41 +88,85 @@
*/
public void close() throws SQLException
{
- SQLException savedEx = null;
- if (_conn != null)
- {
- s_log.debug("Closing connection");
- try
- {
- if (!_conn.getAutoCommit())
- {
- if (_autoCommitOnClose)
- {
- _conn.commit();
- }
- else
- {
- _conn.rollback();
- }
- }
- }
- catch (SQLException ex)
- {
- savedEx = ex;
- }
- _conn.close();
- _conn = null;
- _timeClosed = Calendar.getInstance().getTime();
- if (savedEx != null)
- {
- s_log.debug("Connection close failed", savedEx);
- throw savedEx;
- }
- s_log.debug("Connection closed successfully");
- }
- }
+ ExecutorService executorService = Executors.newSingleThreadExecutor();
- /**
+ int timeoutSeconds = 2;
+ try
+ {
+ Runnable task = new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ _closeIntern();
+ }
+ };
+ Future<?> future = executorService.submit(task);
+
+ future.get(timeoutSeconds, TimeUnit.SECONDS);
+
+ }
+ catch (TimeoutException e)
+ {
+ String message =
+ "The database connection took longer than " + timeoutSeconds + " seconds to close. " +
+ "Maybe closing will succeed later but SQuirreL stops waiting to stay responsive for user interaction.";
+ s_log.error(message, e);
+ }
+ catch (Throwable e)
+ {
+ s_log.error("Error while closing connection", e);
+ }
+ finally
+ {
+ _conn = null;
+ }
+ }
+
+ private void _closeIntern()
+ {
+ try
+ {
+ SQLException savedEx = null;
+ if (_conn != null)
+ {
+ s_log.debug("Closing connection");
+ try
+ {
+ if (!_conn.getAutoCommit())
+ {
+ if (_autoCommitOnClose)
+ {
+ _conn.commit();
+ }
+ else
+ {
+ _conn.rollback();
+ }
+ }
+ }
+ catch (SQLException ex)
+ {
+ savedEx = ex;
+ }
+ _conn.close();
+ _conn = null;
+ _timeClosed = Calendar.getInstance().getTime();
+ if (savedEx != null)
+ {
+ s_log.debug("Connection close failed", savedEx);
+ throw savedEx;
+ }
+ s_log.debug("Connection closed successfully");
+ }
+ }
+ catch (SQLException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
* @see net.sourceforge.squirrel_sql.fw.sql.ISQLConnection#commit()
*/
public void commit() throws SQLException
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-11-14 21:48:39
|
Revision: 6714
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6714&view=rev
Author: gerdwagner
Date: 2012-11-14 21:48:33 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Result table search --> More
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java 2012-11-12 21:57:39 UTC (rev 6713)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java 2012-11-14 21:48:33 UTC (rev 6714)
@@ -2,6 +2,7 @@
import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
import net.sourceforge.squirrel_sql.fw.datasetviewer.MyTableModel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.RowNumberTableColumn;
import net.sourceforge.squirrel_sql.fw.gui.ColumnOrder;
import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
import net.sourceforge.squirrel_sql.fw.gui.SortingListener;
@@ -104,7 +105,10 @@
{
for (int i = 0; i < _table.getColumnModel().getColumnCount(); i++)
{
- _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceCallBack));
+ if (RowNumberTableColumn.ROW_NUMBER_MODEL_INDEX != _table.getColumnModel().getColumn(i).getModelIndex())
+ {
+ _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceCallBack));
+ }
}
if (_table.getModel() instanceof SortableTableModel)
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java 2012-11-12 21:57:39 UTC (rev 6713)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java 2012-11-14 21:48:33 UTC (rev 6714)
@@ -48,13 +48,16 @@
public ArrayList<Integer> getRowsFound()
{
- ArrayList<Integer> ret = new ArrayList();
+ HashSet<Integer> uniqueRows = new HashSet<Integer>();
+
for (Point point : _trace)
{
- ret.add(point.x);
+ uniqueRows.add(point.x);
}
+ ArrayList<Integer> ret = new ArrayList(uniqueRows);
+
Collections.sort(ret);
return ret;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-11-12 21:57:47
|
Revision: 6713
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6713&view=rev
Author: gerdwagner
Date: 2012-11-12 21:57:39 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
Result table search --> More
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.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/DefaultFindService.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java
Removed Paths:
-------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -6,6 +6,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.*;
import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.SimpleDataSet;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -276,7 +277,7 @@
{
try
{
- OverviewDataSet ods = new OverviewDataSet(allRows, columnDisplayDefinitions);
+ SimpleDataSet ods = new SimpleDataSet(allRows, columnDisplayDefinitions);
DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
dsv.init(null, new DefaultDataModelImplementationDetails(_session));
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,43 +0,0 @@
-package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
-
-import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetDefinition;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
-import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
-
-import java.util.List;
-
-public class OverviewDataSet implements IDataSet
-{
- private int _curIx = -1;
- private ColumnDisplayDefinition[] _columnDisplayDefinitions;
- private List<Object[]> _allRows;
-
-
- public OverviewDataSet(List<Object[]> allRows, ColumnDisplayDefinition[] columnDisplayDefinitions)
- {
- _allRows = allRows;
- _columnDisplayDefinitions = columnDisplayDefinitions;
- }
-
- public int getColumnCount() throws DataSetException
- {
- return _columnDisplayDefinitions.length;
- }
-
- public DataSetDefinition getDataSetDefinition() throws DataSetException
- {
- return new DataSetDefinition(_columnDisplayDefinitions);
- }
-
- public boolean next(IMessageHandler msgHandler) throws DataSetException
- {
- return ++_curIx < _allRows.size();
- }
-
- public Object get(int columnIndex) throws DataSetException
- {
- return _allRows.get(_curIx)[columnIndex];
- }
-}
\ No newline at end of file
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -241,7 +241,7 @@
public net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.FindService createFindService()
{
- return new DefaultFindService(_table);
+ return new DefaultFindService(_table, getColumnDefinitions(), _table.getTypedModel());
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -30,14 +30,12 @@
public final class MyTableModel extends AbstractTableModel
{
- private static final long serialVersionUID = 5511368149198548935L;
+ private List<Object[]> _data = new ArrayList<Object[]>();
+ private ColumnDisplayDefinition[] _colDefs = new ColumnDisplayDefinition[0];
+ private IDataSetTableControls _creator = null;
- private List<Object[]> _data = new ArrayList<Object[]>();
- private ColumnDisplayDefinition[] _colDefs = new ColumnDisplayDefinition[0];
- private IDataSetTableControls _creator = null;
-
- MyTableModel(IDataSetTableControls creator)
+ MyTableModel(IDataSetTableControls creator)
{
super();
_creator = creator;
@@ -214,4 +212,9 @@
fireTableDataChanged();
}
+
+ public Object[] getRowAt(Integer rowIx)
+ {
+ return _data.get(rowIx);
+ }
}
Copied: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java (from rev 6710, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewDataSet.java)
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/SimpleDataSet.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -0,0 +1,43 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
+import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
+
+import java.util.List;
+
+public class SimpleDataSet implements IDataSet
+{
+ private int _curIx = -1;
+ private ColumnDisplayDefinition[] _columnDisplayDefinitions;
+ private List<Object[]> _allRows;
+
+
+ public SimpleDataSet(List<Object[]> allRows, ColumnDisplayDefinition[] columnDisplayDefinitions)
+ {
+ _allRows = allRows;
+ _columnDisplayDefinitions = columnDisplayDefinitions;
+ }
+
+ public int getColumnCount() throws DataSetException
+ {
+ return _columnDisplayDefinitions.length;
+ }
+
+ public DataSetDefinition getDataSetDefinition() throws DataSetException
+ {
+ return new DataSetDefinition(_columnDisplayDefinitions);
+ }
+
+ public boolean next(IMessageHandler msgHandler) throws DataSetException
+ {
+ return ++_curIx < _allRows.size();
+ }
+
+ public Object get(int columnIndex) throws DataSetException
+ {
+ return _allRows.get(_curIx)[columnIndex];
+ }
+}
\ No newline at end of file
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -20,7 +20,7 @@
JButton btnUnhighlightResult;
JButton btnHideFindPanel;
JButton btnHighlightFindResult;
- JButton btnShowFoundRowsInTable;
+ JButton btnShowRowsFoundInTable;
public DataSetFindPanel()
{
@@ -72,10 +72,10 @@
add(btnUnhighlightResult, gbc);
gbc = new GridBagConstraints(7,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
- btnShowFoundRowsInTable = new JButton(rsrc.getIcon(LibraryResources.IImageNames.MARKED_TO_NEW_TABLE));
- btnShowFoundRowsInTable.setToolTipText(s_stringMgr.getString("DataSetFindPanel.showFoundRowsInTable"));
- btnShowFoundRowsInTable.setBorder(BorderFactory.createEtchedBorder());
- add(btnShowFoundRowsInTable, gbc);
+ btnShowRowsFoundInTable = new JButton(rsrc.getIcon(LibraryResources.IImageNames.MARKED_TO_NEW_TABLE));
+ btnShowRowsFoundInTable.setToolTipText(s_stringMgr.getString("DataSetFindPanel.showFoundRowsInTable"));
+ btnShowRowsFoundInTable.setBorder(BorderFactory.createEtchedBorder());
+ add(btnShowRowsFoundInTable, gbc);
gbc = new GridBagConstraints(8,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
btnHideFindPanel = new JButton(rsrc.getIcon(LibraryResources.IImageNames.HIDE));
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-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,11 +1,14 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
import net.sourceforge.squirrel_sql.fw.util.*;
import org.apache.commons.lang.StringUtils;
+import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.List;
public class DataSetFindPanelController
{
@@ -71,9 +74,18 @@
}
});
+ _dataSetFindPanel.btnShowRowsFoundInTable.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onShowRowsFoundInTable();
+ }
+ });
+
_dataSetFindPanel.btnHideFindPanel.addActionListener(new ActionListener()
{
@Override
@@ -85,7 +97,50 @@
}
+ private void onShowRowsFoundInTable()
+ {
+ Window parent = SwingUtilities.windowForComponent(_dataSetFindPanel);
+ JDialog dlg = new JDialog(parent, s_stringMgr.getString("DataSetFindPanel.searchResult"));
+ dlg.getContentPane().add(new JScrollPane(createSimpleTable().getComponent()));
+
+ dlg.setLocation(_dataSetViewerTablePanel.getComponent().getLocationOnScreen());
+ dlg.setSize(_findService.getVisibleSize());
+ dlg.setVisible(true);
+ }
+
+
+ private DataSetViewerTablePanel createSimpleTable()
+ {
+ try
+ {
+ List<Object[]> allRows = _findService.getRowsForIndexes(_trace.getRowsFound());
+ ColumnDisplayDefinition[] columnDisplayDefinitions = _findService.getColumnDisplayDefinitions();
+
+ SimpleDataSet ods = new SimpleDataSet(allRows, columnDisplayDefinitions);
+
+ DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
+
+ IDataModelImplementationDetails dataModelImplementationDetails = new IDataModelImplementationDetails()
+ {
+ @Override
+ public String getStatementSeparator()
+ {
+ return ";";
+ }
+ };
+
+ dsv.init(null, dataModelImplementationDetails);
+ dsv.show(ods);
+ return dsv;
+ }
+ catch (DataSetException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
public void wasHidden()
{
onUnhighlightResult();
@@ -107,13 +162,19 @@
{
_findService = _dataSetViewerTablePanel.createFindService();
- _findService.setFindServiceRenderCallBack(new FindServiceRenderCallBack()
+ _findService.setFindServiceCallBack(new FindServiceCallBack()
{
@Override
public FindMarkColor getBackgroundColor(int viewRow, int viewColumn)
{
return onGetBackgroundColor(viewRow, viewColumn);
}
+
+ @Override
+ public void tableCellStructureChanged()
+ {
+ onUnhighlightResult();
+ }
});
_tableTraverser.setFindService(_findService);
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,15 +1,31 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.MyTableModel;
+import net.sourceforge.squirrel_sql.fw.gui.ColumnOrder;
+import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
+import net.sourceforge.squirrel_sql.fw.gui.SortingListener;
+
import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.TableColumnModelEvent;
+import javax.swing.event.TableColumnModelListener;
import java.awt.*;
+import java.util.*;
+import java.util.List;
public class DefaultFindService implements FindService
{
private JTable _table;
+ private ColumnDisplayDefinition[] _columnDefinitions;
+ private MyTableModel _myTableModel;
- public DefaultFindService(JTable table)
+ public DefaultFindService(JTable table, ColumnDisplayDefinition[] columnDefinitions, MyTableModel myTableModel)
{
_table = table;
+ _columnDefinitions = columnDefinitions;
+ _myTableModel = myTableModel;
}
@Override
@@ -60,12 +76,68 @@
}
@Override
- public void setFindServiceRenderCallBack(FindServiceRenderCallBack findServiceRenderCallBack)
+ public ColumnDisplayDefinition[] getColumnDisplayDefinitions()
{
+ return _columnDefinitions;
+ }
+ @Override
+ public List<Object[]> getRowsForIndexes(ArrayList<Integer> rowIndexes)
+ {
+ ArrayList<Object[]> ret = new ArrayList<Object[]>();
+
+ for (Integer row : rowIndexes)
+ {
+ ret.add(_myTableModel.getRowAt(row));
+ }
+ return ret;
+ }
+
+ @Override
+ public Dimension getVisibleSize()
+ {
+ return _table.getVisibleRect().getSize();
+ }
+
+ @Override
+ public void setFindServiceCallBack(final FindServiceCallBack findServiceCallBack)
+ {
for (int i = 0; i < _table.getColumnModel().getColumnCount(); i++)
{
- _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceRenderCallBack));
+ _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceCallBack));
}
+
+ if (_table.getModel() instanceof SortableTableModel)
+ {
+ ((SortableTableModel)_table.getModel()).addSortingListener(new SortingListener()
+ {
+ @Override
+ public void sortingDone(int modelColumnIx, ColumnOrder columnOrder)
+ {
+ findServiceCallBack.tableCellStructureChanged();
+ }
+ });
+ }
+
+ _table.getColumnModel().addColumnModelListener(new TableColumnModelListener()
+ {
+ @Override
+ public void columnAdded(TableColumnModelEvent e){}
+
+ @Override
+ public void columnRemoved(TableColumnModelEvent e) {}
+
+ @Override
+ public void columnMoved(TableColumnModelEvent e)
+ {
+ findServiceCallBack.tableCellStructureChanged();
+ }
+
+ @Override
+ public void columnMarginChanged(ChangeEvent e) {}
+
+ @Override
+ public void columnSelectionChanged(ListSelectionEvent e) {}
+ });
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,5 +1,11 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
public interface FindService
{
int getRowCount();
@@ -10,9 +16,15 @@
void scrollToVisible(int viewRow, int viewCol);
- void setFindServiceRenderCallBack(FindServiceRenderCallBack findServiceRenderCallBack);
+ void setFindServiceCallBack(FindServiceCallBack findServiceCallBack);
void repaintCell(int viewRow, int viewCol);
void repaintAll();
+
+ ColumnDisplayDefinition[] getColumnDisplayDefinitions();
+
+ List<Object[]> getRowsForIndexes(ArrayList<Integer> rowsFound);
+
+ Dimension getVisibleSize();
}
Copied: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java (from rev 6712, trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java)
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCallBack.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -0,0 +1,8 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+public interface FindServiceCallBack
+{
+ FindMarkColor getBackgroundColor(int viewRow, int viewColumn);
+
+ void tableCellStructureChanged();
+}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -8,22 +8,22 @@
public class FindServiceCellRendererDecorator implements TableCellRenderer
{
private TableCellRenderer _delegate;
- private FindServiceRenderCallBack _findServiceRenderCallBack;
+ private FindServiceCallBack _findServiceCallBack;
private Point _pointBuffer = new Point();
private HashMap<Point, Color> _originalColorsByCell = new HashMap<Point, Color>();
- public FindServiceCellRendererDecorator(TableCellRenderer delegate, FindServiceRenderCallBack findServiceRenderCallBack)
+ public FindServiceCellRendererDecorator(TableCellRenderer delegate, FindServiceCallBack findServiceCallBack)
{
_delegate = delegate;
- _findServiceRenderCallBack = findServiceRenderCallBack;
+ _findServiceCallBack = findServiceCallBack;
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
{
- FindMarkColor findMarkColor = _findServiceRenderCallBack.getBackgroundColor(row, column);
+ FindMarkColor findMarkColor = _findServiceCallBack.getBackgroundColor(row, column);
Component tableCellRendererComponent = _delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
Deleted: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,6 +0,0 @@
-package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
-
-public interface FindServiceRenderCallBack
-{
- FindMarkColor getBackgroundColor(int viewRow, int viewColumn);
-}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java 2012-11-12 21:57:39 UTC (rev 6713)
@@ -1,6 +1,8 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
public class FindTrace
@@ -43,4 +45,18 @@
_current = null;
_trace.clear();
}
+
+ public ArrayList<Integer> getRowsFound()
+ {
+ ArrayList<Integer> ret = new ArrayList();
+
+ for (Point point : _trace)
+ {
+ ret.add(point.x);
+ }
+
+ Collections.sort(ret);
+
+ return ret;
+ }
}
Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties 2012-11-11 21:12:19 UTC (rev 6712)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties 2012-11-12 21:57:39 UTC (rev 6713)
@@ -16,3 +16,5 @@
DataSetFindPanel.unmarkFindResult=Unhighlight find result and return find cursor to begin
DataSetFindPanel.showFoundRowsInTable=Show marked rows in own table window
DataSetFindPanel.hideFind=Hide search panel
+
+DataSetFindPanel.searchResult=Marked rows in table search
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
