|
From: <ger...@us...> - 2012-10-16 11:35:07
|
Revision: 6689
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6689&view=rev
Author: gerdwagner
Date: 2012-10-16 11:34:52 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Detached Windows --> Made Dialogs appear above the right window
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowDriverWebsiteCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowLoadedDriversOnlyCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewFileCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewHelpCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ObjectTreeSearch.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionWindowCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CopyObjectNameCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DumpSessionCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/EditWhereColsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FilterObjectsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FormatSQLCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoNextResultsTabCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoPreviousResultsTabCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ReturnResultTabCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SQLFilterCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SessionPropertiesCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SetDefaultCatalogCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/MakeEditableCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyHtmlCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInsertStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyUpdateStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWhereStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWikiCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectAllCellsCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/UndoMakeEditableCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ICommand.java
trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataCommand.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/CompareCommand.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/SelectCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveNewLinesCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlAction.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/IndexDefragCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureExecCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShowStatisticsCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseFileCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/TruncateLogCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/UpdateStatisticsCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractMultipleSQLCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractTableListCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateTableCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseCommand.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/actions/AbstractObjectTreeAction.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/VacuumDatabaseCommand.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/VacuumTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AbstractRefactoringCommand.java
trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/AddBookmarkCommand.java
trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/RunBookmarkCommand.java
trunk/sql12/plugins/sqlparam/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamExecutionListener.java
trunk/sql12/plugins/sqlreplace/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlreplace/SQLReplaceExecutionListener.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/AbstractDataScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptOfCurrentSQLCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateFileOfCurrentSQLAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateFileOfCurrentSQLCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateSelectScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCommand.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectController.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectDlg.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ConfigureAutoCorrectAction.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -869,7 +869,6 @@
private void createMainFrame()
{
_mainFrame = new MainFrame(_app);
- GUIUtils.setMainFrame(_mainFrame);
}
private void createAliasesListUI()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -1,14 +1,9 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import net.sourceforge.squirrel_sql.fw.gui.action.BaseAction;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.IWidget;
-import javax.swing.*;
-
public class SelectWidgetAction extends BaseAction
{
private static final int MAX_TITLE_LENGTH = 50;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -1,11 +1,8 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
-import java.beans.PropertyVetoException;
-
import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.IWidget;
public class SelectWidgetCommand implements ICommand
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+
/**
* This <CODE>Action</CODE> displays the applications About Box.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.AboutBoxDialog;
+
/**
* This <CODE>ICommand</CODE> allows the user to copy an existing
* <TT>ISQLAlias</TT> to a new one and then maintain the new one.
@@ -52,7 +53,7 @@
/**
* Display the About Box.
- */
+ */
public void execute()
{
AboutBoxDialog.showAboutBox(_app);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -53,7 +53,7 @@
/**
* Close all sessions.
- */
+ */
public void execute()
{
_app.getSessionManager().closeAllButCurrentSessions();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,6 +23,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+
/**
* This <CODE>Action</CODE> allows the user to close all currently
* open sessions.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to close all open sessions.
*
@@ -52,7 +53,7 @@
/**
* Close all sessions.
- */
+ */
public void execute()
{
_app.getSessionManager().closeAllSessions();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,7 +20,7 @@
*/
import java.sql.SQLException;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.db.ConnectToAliasCallBack;
@@ -117,7 +117,7 @@
/**
* Display connection internal frame.
- */
+ */
public void execute()
{
try
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,8 @@
import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> allows the user to copy an existing
* <TT>ISQLAlias</TT> to a new one and then maintain the new one.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,9 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> allows the user to copy an existing
* <TT>ISQLDriver</TT> to a new one and then maintain the new one.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import java.awt.event.ActionEvent;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>Action</CODE> allows the user to create a new <TT>ISQLAlias</TT>.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to create a new <TT>ISQLAlias</TT>.
*
@@ -50,7 +51,7 @@
/**
* Execute command.
- */
+ */
public void execute()
{
_app.getWindowManager().showNewAliasInternalFrame();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,8 @@
import net.sourceforge.squirrel_sql.client.IApplication;
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> allows the user to create a new <TT>ISQLDriver</TT>.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -28,6 +28,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
/**
* This <CODE>ICommand</CODE> allows the user to delete an existing
* <TT>ISQLDriver</TT>.
@@ -80,7 +81,7 @@
/**
* Delete the current <TT>ISQLDriver</TT> after confirmation.
- */
+ */
public void execute()
{
final Object[] args = {_sqlDriver.getName()};
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -50,6 +50,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.DumpSessionCommand;
import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
+
/**
* This <CODE>ICommand</CODE> will dump the status of the application.
*
@@ -112,7 +113,7 @@
/**
* Dump the application.
- */
+ */
public void execute()
{
List<File> files = new ArrayList<File>();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.preferences.GlobalPreferencesSheet;
+
/**
* This <CODE>ICommand</CODE> displays the Global Preferences dialog..
*
@@ -51,7 +52,7 @@
/**
* Display the Dialog
- */
+ */
public void execute()
{
GlobalPreferencesSheet.showSheet(_app, null);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to install the defautl drivers.
*
@@ -69,7 +70,7 @@
* Load the default drivers into the cache and then
* make sure that the drivers list is showing all
* drivers.
- */
+ */
public void execute() throws BaseException
{
try
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to modify an existing
* <TT>ISQLDriver</TT>.
@@ -63,7 +64,7 @@
/**
* Display a dialog allowing user to maintain the <TT>ISQLDriver</TT>.
- */
+ */
public void execute()
{
_app.getWindowManager().showModifyDriverInternalFrame(_driver);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowDriverWebsiteCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourcefor...
[truncated message content] |
|
From: <ger...@us...> - 2012-10-20 02:48:26
|
Revision: 6691
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6691&view=rev
Author: gerdwagner
Date: 2012-10-20 02:48:19 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
On DB2 for AS400 column completion didn't work in some cases. (Thanks to Stefan Hohenstein for the patch.)
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-20 02:48:19 UTC (rev 6691)
@@ -36,6 +36,8 @@
Bug fixes:
+On DB2 for AS400 column completion didn't work in some cases. (Thanks to Stefan Hohenstein for the patch.)
+
3575054: SQL results text mode is not working
Fixed repaint problem in Hibernate Plugin.
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java 2012-10-20 02:48:19 UTC (rev 6691)
@@ -67,7 +67,7 @@
{
public void schemaInfoUpdated()
{
- _completionInfosByCataLogAndSchema =
+ _completionInfosByCataLogAndSchema =
new Hashtable<String, Vector<CodeCompletionInfo>>();
}
});
@@ -103,12 +103,14 @@
CodeCompletionTableInfo dupl = (CodeCompletionTableInfo) completionInfoByUcTableName.get(ucTableName);
+ //SH add the session object as last parameter
CodeCompletionTableInfo tableInfo = new CodeCompletionTableInfo(tables[i].getSimpleName(),
- tables[i].getType(),
- tables[i].getCatalogName(),
- tables[i].getSchemaName(),
- _useCompletionPrefs,
- _prefs);
+ tables[i].getType(),
+ tables[i].getCatalogName(),
+ tables[i].getSchemaName(),
+ _useCompletionPrefs,
+ _prefs,
+ _session);
if(null != dupl)
{
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java 2012-10-20 02:48:19 UTC (rev 6691)
@@ -27,9 +27,10 @@
private String _toString;
public CodeCompletionTableAliasInfo(TableAliasInfo aliasInfo, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
- {
- super(aliasInfo.tableName, "TABLE", null, null, useCompletionPrefs, prefs);
- _aliasInfo = aliasInfo;
+ {
+ //SH add last parameter ISession. Used in the super class
+ super(aliasInfo.tableName, "TABLE", null, null, useCompletionPrefs, prefs, null);
+ _aliasInfo = aliasInfo;
_toString = _aliasInfo.aliasName + " (Alias for " + _aliasInfo.tableName + ")";
}
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java 2012-10-20 02:48:19 UTC (rev 6691)
@@ -22,6 +22,9 @@
import java.util.HashSet;
import net.sourceforge.squirrel_sql.client.session.ExtendedColumnInfo;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
public class CodeCompletionTableInfo extends CodeCompletionInfo
@@ -34,9 +37,12 @@
private String _schema;
private boolean _useCompletionPrefs;
private CodeCompletionPreferences _prefs;
+ ////SH add the session object
+ private ISession _session;
- public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
+ //SH add the session object as last parameter
+ public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema, boolean useCompletionPrefs, CodeCompletionPreferences prefs, ISession session)
{
_tableName = tableName;
_tableType = tableType;
@@ -44,8 +50,9 @@
_schema = schema;
_useCompletionPrefs = useCompletionPrefs;
_prefs = prefs;
+ //SH
+ _session = session;
-
if(null != _tableType && !"TABLE".equals(_tableType))
{
_toString = _tableName + " (" + _tableType + ")";
@@ -81,7 +88,9 @@
public ArrayList<CodeCompletionInfo> getColumns(net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo schemaInfo, String colNamePattern)
throws SQLException
{
- if(null == _colInfos)
+ //System.out.println("getColumns colInfos:" + _colInfos + " schemaInfo :" + schemaInfo + " colNamePattern :" + colNamePattern);
+ //SH
+ if(null == _colInfos || _colInfos.size() == 0)
{
ExtendedColumnInfo[] schemColInfos = schemaInfo.getExtendedColumnInfos(_catalog, _schema, _tableName);
@@ -112,6 +121,28 @@
}
}
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // According to Stefan Hohenstein this block makes column completion work on db2/400 work in special cases where it didn't work before.
+ // The code is executed only in the peculiar case when no columns could be found for a table.
+ if(colInfosBuf.size() == 0 && _session != null)
+ {
+ SQLDatabaseMetaData sdmd = _session.getSQLConnection().getSQLMetaData();
+ TableColumnInfo[] ti = sdmd.getColumnInfo(_catalog, _schema, _tableName);
+ for(int x = 0; x < ti.length; x++)
+ {
+ CodeCompletionColumnInfo buf = new CodeCompletionColumnInfo(ti[x].getColumnName(), ti[x].getRemarks(), ti[x].getTypeName(), ti[x].getColumnSize(), ti[x].getDecimalDigits(), (ti[x].isNullable().equals("NO")) ? false : true, _useCompletionPrefs, _prefs.isShowRemarksInColumnCompletion());
+ String bufStr = buf.toString();
+ if (!uniqCols.contains(bufStr))
+ {
+ uniqCols.add(bufStr);
+ colInfosBuf.add(buf);
+ }
+ }
+ }
+ //
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
_colInfos = colInfosBuf;
}
@@ -130,7 +161,7 @@
{
ret.add(colInfo);
}
-
+
}
return ret;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-22 20:50:43
|
Revision: 6694
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6694&view=rev
Author: gerdwagner
Date: 2012-10-22 20:50:36 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Execution time passed is shown during SQL execution.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:50:36 UTC (rev 6694)
@@ -7,6 +7,8 @@
import javax.swing.*;
import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class CancelPanel extends JPanel
{
@@ -16,6 +18,7 @@
JLabel currentStatusLbl = new JLabel();
JButton cancelBtn;
JButton closeBtn;
+ JTextField txtExecTimeCounter;
public CancelPanel(ISession session)
@@ -82,6 +85,32 @@
gbc.fill = GridBagConstraints.NONE;
ret.add(cancelBtn, gbc);
+ gbc.gridx = 0;
+ ++gbc.gridy;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.insets = new Insets(30, gbc.insets.left, gbc.insets.bottom, gbc.insets.right);
+ ret.add(createExecutionTimePanel(), gbc);
return ret;
}
+
+ private JPanel createExecutionTimePanel()
+ {
+ JPanel ret = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0);
+ ret.add(new JLabel(s_stringMgr.getString("SQLResultExecuterPanel.executingFor")), gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
+ txtExecTimeCounter = new JTextField();
+ txtExecTimeCounter.setEditable(false);
+ ret.add(txtExecTimeCounter, gbc);
+
+ gbc = new GridBagConstraints(2,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
+ ret.add(new JLabel(s_stringMgr.getString("SQLResultExecuterPanel.execMillis")), gbc);
+
+
+ return ret;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-22 20:50:36 UTC (rev 6694)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -25,12 +26,27 @@
*/
private int _currentQueryIndex = 0;
private CancelPanelListener _listener;
+ private final Timer _timer;
+ private final long _beginMillis;
CancelPanelCtrl(CancelPanelListener listener, ISession session)
{
_listener = listener;
_panel = new CancelPanel(session);
+ _beginMillis = System.currentTimeMillis();
+ _timer = new Timer(100, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onUpdateExecutionTime();
+ }
+ });
+ _timer.setRepeats(true);
+ _timer.start();
+
+
_panel.cancelBtn.addActionListener(new ActionListener()
{
@Override
@@ -52,6 +68,11 @@
}
+ private void onUpdateExecutionTime()
+ {
+ _panel.txtExecTimeCounter.setText("" + (System.currentTimeMillis() - _beginMillis));
+ }
+
void incCurrentQueryIndex()
{
++_currentQueryIndex;
@@ -117,6 +138,7 @@
{
_panel.cancelBtn.doClick();
_listener.closeRquested();
+ _timer.stop();
}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-22 20:50:36 UTC (rev 6694)
@@ -84,4 +84,8 @@
ErrorPanel.copyAll=Copy All
ErrorPanel.copySelection=Copy Selection
-ResultFrame.rerun=Rerun this tab's SQL Query
\ No newline at end of file
+ResultFrame.rerun=Rerun this tab's SQL Query
+
+SQLResultExecuterPanel.executingFor=Executing since
+SQLResultExecuterPanel.execMillis=milli seconds
+
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-22 20:50:36 UTC (rev 6694)
@@ -8,6 +8,8 @@
Enhancements:
+Execution time passed is shown during SQL execution.
+
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
Cristiano Guadagnino contributed all of the SQL required for the DB2Plugin to properly support the DB2 z/OS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-24 19:52:06
|
Revision: 6698
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6698&view=rev
Author: gerdwagner
Date: 2012-10-24 19:51:59 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
- Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
- 2798081 Right click on column header changes sort order
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 19:51:59 UTC (rev 6698)
@@ -38,6 +38,10 @@
Bug fixes:
+Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
+
+2798081 Right click on column header changes sort order
+
On DB2 for AS400 column completion didn't work in some cases. (Thanks to Stefan Hohenstein for the patch.)
3575054: SQL results text mode is not working
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 19:51:59 UTC (rev 6698)
@@ -74,13 +74,13 @@
* if <tt>_pressed</tt> is <tt>true</tt> then this is the physical column
* that the mouse was pressed in.
*/
- private int _pressedColumnIdx;
+ private int _pressedViewColumnIdx;
/** Icon for the currently sorted column. */
private Icon _currentSortedColumnIcon;
/** Physical (as opposed to model) index of the currently sorted column. */
- private int _currentlySortedColumnIdx = -1;
+ private int _currentlySortedModelIdx = -1;
static
{
@@ -106,7 +106,7 @@
super();
_pressed = false;
_dragged = false;
- _pressedColumnIdx = -1;
+ _pressedViewColumnIdx = -1;
setDefaultRenderer(new ButtonTableRenderer(getFont()));
@@ -138,8 +138,8 @@
{
_currentSortedColumnIcon = s_descIcon;
}
- _currentlySortedColumnIdx = viewColumnIndex;
- _pressedColumnIdx = viewColumnIndex;
+ _currentlySortedModelIdx = modelColumnIx;
+ _pressedViewColumnIdx = viewColumnIndex;
repaint();
}
@@ -185,7 +185,7 @@
}
}
_currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ _currentlySortedModelIdx = -1;
}
// SS: Display complete column header as tooltip if the column isn't wide enough to display it
@@ -220,9 +220,9 @@
/**
* @return The currently sorted column index. If no column is sorted -1.
*/
- public int getCurrentlySortedColumnIdx()
+ public int getCurrentlySortedModelIdx()
{
- return _currentlySortedColumnIdx;
+ return _currentlySortedModelIdx;
}
/**
@@ -236,22 +236,22 @@
public void columnIndexWillBeRemoved(int colIx)
{
- if( colIx < _currentlySortedColumnIdx)
- {
- --_currentlySortedColumnIdx;
- }
- else if (colIx == _currentlySortedColumnIdx)
- {
- _currentlySortedColumnIdx = -1;
- }
+// if( colIx < _currentlySortedModelIdx)
+// {
+// --_currentlySortedModelIdx;
+// }
+// else if (colIx == _currentlySortedModelIdx)
+// {
+// _currentlySortedModelIdx = -1;
+// }
}
public void columnIndexWillBeAdded(int colIx)
{
- if( colIx <= _currentlySortedColumnIdx)
- {
- ++_currentlySortedColumnIdx;
- }
+// if( colIx <= _currentlySortedModelIdx)
+// {
+// ++_currentlySortedModelIdx;
+// }
}
public void adjustAllColWidths(boolean includeColHeaders)
@@ -291,7 +291,7 @@
public void tableChanged(TableModelEvent evt)
{
_currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ _currentlySortedModelIdx = -1;
}
}
@@ -373,7 +373,7 @@
*/
public void mousePressed(MouseEvent e)
{
- if(getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ if(getCursor().getType() == Cursor.E_RESIZE_CURSOR || MouseEvent.BUTTON1 != e.getButton())
{
return;
}
@@ -384,7 +384,7 @@
return;
}
- _pressedColumnIdx = columnAtPoint(e.getPoint());
+ _pressedViewColumnIdx = columnAtPoint(e.getPoint());
repaint();
}
@@ -413,7 +413,7 @@
*/
public void mouseReleased(MouseEvent e)
{
- if(getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ if(getCursor().getType() == Cursor.E_RESIZE_CURSOR || MouseEvent.BUTTON1 != e.getButton())
{
return;
}
@@ -430,7 +430,7 @@
if (!_dragged)
{
_currentSortedColumnIcon = null;
- int column = getTable().convertColumnIndexToModel(_pressedColumnIdx);
+ int column = getTable().convertColumnIndexToModel(_pressedViewColumnIdx);
TableModel tm = table.getModel();
if (column > -1
@@ -446,7 +446,7 @@
{
_currentSortedColumnIcon = s_descIcon;
}
- _currentlySortedColumnIdx = _pressedColumnIdx;
+ _currentlySortedModelIdx = column;
}
repaint();
}
@@ -461,8 +461,9 @@
_dragged = true;
if (_pressed)
{
- _currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ //_currentSortedColumnIcon = null;
+// _currentlySortedModelIdx = -1;
+// _pressedViewColumnIdx = -1;
_pressed = false;
repaint();
}
@@ -518,13 +519,13 @@
}
// Rendering the column that the mouse has been pressed in.
- if (_pressedColumnIdx == column && _pressed)
+ if (_pressedViewColumnIdx == column && _pressed)
{
_buttonLowered.setText(value.toString());
// If this is the column that the table is currently is
// currently sorted by then display the sort icon.
- if (column == _currentlySortedColumnIdx
+ if (column == getViewColumnIndex(_currentlySortedModelIdx)
&& _currentSortedColumnIcon != null)
{
_buttonLowered.setIcon(_currentSortedColumnIcon);
@@ -539,7 +540,7 @@
// This is not the column that the mouse has been pressed in.
_buttonRaised.setText(value.toString());
if (_currentSortedColumnIcon != null
- && column == _currentlySortedColumnIdx)
+ && column == getViewColumnIndex(_currentlySortedModelIdx))
{
_buttonRaised.setIcon(_currentSortedColumnIcon);
}
Modified: 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/gui/SortableTableModel.java 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 19:51:59 UTC (rev 6698)
@@ -36,10 +36,8 @@
public class SortableTableModel extends AbstractTableModel
{
- private static final long serialVersionUID = -3534263285990454876L;
+ transient private MyTableModelListener _actualModelLis = new MyTableModelListener();
- transient private MyTableModelListener _actualModelLis = new MyTableModelListener();
-
/** Column currently being sorted by. -1 means unsorted. */
private int _sortedColumn = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-24 20:53:00
|
Revision: 6699
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6699&view=rev
Author: gerdwagner
Date: 2012-10-24 20:52:53 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Sorting can now be returned to natural order by clicking on a column header a third time. (First time is asc, second time desc and third time natural)
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.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/gui/SortingListener.java
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 20:52:53 UTC (rev 6699)
@@ -8,6 +8,8 @@
Enhancements:
+Sorting can now be returned to natural order by clicking on a column header a third time. (First time is asc, second time desc and third time natural)
+
Execution time passed is shown during SQL execution.
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -1,6 +1,6 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer;
-import net.sourceforge.squirrel_sql.fw.gui.SortableTable;
+import net.sourceforge.squirrel_sql.fw.gui.ColumnOrder;
import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
import javax.swing.*;
@@ -14,7 +14,7 @@
private boolean _applySorting;
private int _sortedColumn;
- private boolean _sortedAscending;
+ private ColumnOrder _columnOrder;
private Rectangle _visibleRect;
private HashMap<Integer, Integer> _columnWidthsByModelIndex = new HashMap<Integer, Integer>();
private HashMap<Integer, Integer> _columnIndexByModelIndex = new HashMap<Integer, Integer>();
@@ -27,7 +27,7 @@
{
_applySorting = true;
_sortedColumn = ((SortableTableModel)table.getModel()).getSortedColumn();
- _sortedAscending = ((SortableTableModel)table.getModel()).isSortedAscending();
+ _columnOrder = ((SortableTableModel)table.getModel()).getColumnOrder();
}
@@ -78,7 +78,7 @@
{
if(-1 != _sortedColumn)
{
- ((SortableTableModel)table.getModel()).sortByColumn(_sortedColumn, _sortedAscending);
+ ((SortableTableModel)table.getModel()).sortByColumn(_sortedColumn, _columnOrder);
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -117,27 +117,31 @@
_sortingListener = new SortingListener()
{
@Override
- public void sortingDone(int modelColumnIx, boolean ascending)
+ public void sortingDone(int modelColumnIx, ColumnOrder columnOrder)
{
- onSortingDone(modelColumnIx, ascending);
+ onSortingDone(modelColumnIx, columnOrder);
}
};
}
- private void onSortingDone(int modelColumnIx, boolean ascending)
+ private void onSortingDone(int modelColumnIx, ColumnOrder columnOrder)
{
int viewColumnIndex = getViewColumnIndex(modelColumnIx);
- if (ascending)
+ if (ColumnOrder.ASC == columnOrder)
{
_currentSortedColumnIcon = s_ascIcon;
}
- else
+ else if (ColumnOrder.DESC == columnOrder)
{
_currentSortedColumnIcon = s_descIcon;
}
+ else
+ {
+ _currentSortedColumnIcon = null;
+ }
_currentlySortedModelIdx = modelColumnIx;
_pressedViewColumnIdx = viewColumnIndex;
@@ -320,7 +324,14 @@
Rectangle2D bounds = headerFontMetrics.getStringBounds("" + column.getHeaderValue(), headerComp.getGraphics());
- newWidth = Math.max(newWidth, bounds.getBounds().width);
+ int width = bounds.getBounds().width;
+ if(-1 != _currentlySortedModelIdx && colIx == getViewColumnIndex(_currentlySortedModelIdx) && null != _currentSortedColumnIcon)
+ {
+ width += _currentSortedColumnIcon.getIconWidth();
+ }
+
+
+ newWidth = Math.max(newWidth, width);
}
@@ -438,14 +449,18 @@
&& tm instanceof SortableTableModel)
{
((SortableTableModel) tm).sortByColumn(column);
- if (((SortableTableModel)tm).isSortedAscending())
+ if (ColumnOrder.ASC == ((SortableTableModel)tm).getColumnOrder())
{
_currentSortedColumnIcon = s_ascIcon;
}
- else
+ else if (ColumnOrder.DESC == ((SortableTableModel)tm).getColumnOrder())
{
_currentSortedColumnIcon = s_descIcon;
}
+ else
+ {
+ _currentSortedColumnIcon = null;
+ }
_currentlySortedModelIdx = column;
}
repaint();
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -0,0 +1,18 @@
+package net.sourceforge.squirrel_sql.fw.gui;
+
+public enum ColumnOrder
+{
+ NATURAL, ASC, DESC;
+
+ public ColumnOrder next()
+ {
+ switch(this)
+ {
+ case NATURAL: return ASC;
+ case ASC: return DESC;
+ case DESC: return NATURAL;
+ default: throw new IllegalStateException("Unknown ColumnOrder " + this);
+ }
+
+ }
+}
Modified: 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/gui/SortableTableModel.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.List;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
@@ -41,7 +40,7 @@
/** Column currently being sorted by. -1 means unsorted. */
private int _sortedColumn = -1;
- private boolean _ascending;
+ private ColumnOrder _columnOrder = ColumnOrder.NATURAL;
/** The actual model that this model is wrapped around. */
private TableModel _actualModel;
@@ -216,15 +215,15 @@
* was last sorted and then inverted that mode. If the column was not
* the previous sorted column then it will be sorted in ascending mode.
*/
- public boolean sortByColumn(int column)
+ public ColumnOrder sortByColumn(int column)
{
- boolean b = true;
+ ColumnOrder newOrder = ColumnOrder.ASC;
if (column == _sortedColumn)
{
- b = !_ascending;
+ newOrder = _columnOrder.next();
}
- sortByColumn(column, b);
- return b;
+ sortByColumn(column, newOrder);
+ return newOrder;
}
/**
@@ -233,32 +232,41 @@
* @param column column to sort by
* @param ascending sort ascending if <TT>true</TT> else descending.
*/
- public void sortByColumn(int column, boolean ascending)
+ public void sortByColumn(int column, ColumnOrder newOrder)
{
_sortedColumn = column;
- _ascending = ascending;
- TableModelComparator comparator = new TableModelComparator(column, ascending);
- // Should the data be first cloned so that the sorting doesn't take place
- // on the array that is used in getValue()
- // TODO: This is a must if sorting is done in a thread! ??
- Arrays.sort(_indexes, comparator);
- fireTableDataChanged();
- fireSortingListeners(column, ascending);
+ _columnOrder = newOrder;
+ if (ColumnOrder.NATURAL != newOrder)
+ {
+ TableModelComparator comparator = new TableModelComparator(column, newOrder);
+ // Should the data be first cloned so that the sorting doesn't take place
+ // on the array that is used in getValue()
+ Arrays.sort(_indexes, comparator);
+ }
+ else
+ {
+ for (int i = 0; i < _indexes.length; i++)
+ {
+ _indexes[i] = i;
+ }
+ }
+ fireTableDataChanged();
+ fireSortingListeners(column, _columnOrder);
}
- private void fireSortingListeners(int column, boolean ascending)
+ private void fireSortingListeners(int column, ColumnOrder columnOrder)
{
SortingListener[] listeners = _sortingListeners.toArray(new SortingListener[_sortingListeners.size()]);
for (SortingListener listener : listeners)
{
- listener.sortingDone(column, ascending);
+ listener.sortingDone(column, columnOrder);
}
}
- public boolean isSortedAscending()
+ public ColumnOrder getColumnOrder()
{
- return _ascending;
+ return _columnOrder;
}
public void tableChanged()
@@ -267,7 +275,7 @@
if(-1 != _sortedColumn)
{
- sortByColumn(_sortedColumn, _ascending);
+ sortByColumn(_sortedColumn, _columnOrder);
}
else
{
@@ -314,24 +322,19 @@
class TableModelComparator implements Comparator<Integer>
{
- private int _iColumn;
- private int _iAscending;
- private final Collator _collator = Collator.getInstance();
- private boolean _allDataIsString = true;
+ private int _iColumn;
+ private int _iAscending;
+ private final Collator _collator = Collator.getInstance();
+ private boolean _allDataIsString = true;
- public TableModelComparator(int iColumn)
+ public TableModelComparator(int iColumn, ColumnOrder compColumnOrder)
{
- this(iColumn, true);
- }
-
- public TableModelComparator(int iColumn, boolean ascending)
- {
_iColumn = iColumn;
- if (ascending)
+ if (ColumnOrder.ASC == compColumnOrder)
{
_iAscending = 1;
}
- else
+ else if (ColumnOrder.DESC == compColumnOrder)
{
_iAscending = -1;
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortingListener.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortingListener.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortingListener.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -2,5 +2,5 @@
public interface SortingListener
{
- void sortingDone(int modelColumnIx, boolean ascending);
+ void sortingDone(int modelColumnIx, ColumnOrder columnOrder);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-25 22:12:22
|
Revision: 6700
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6700&view=rev
Author: gerdwagner
Date: 2012-10-25 22:12:13 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
Hibernate Plugin:
New function in tools pop up and right mouse menu of HQL editor: Copy SQL generated from current HQL to clipboard.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-25 22:12:13 UTC (rev 6700)
@@ -8,6 +8,9 @@
Enhancements:
+Hibernate Plugin:
+ New function in tools pop up and right mouse menu of HQL editor: Copy SQL generated from current HQL to clipboard.
+
Sorting can now be returned to natural order by clicking on a column header a third time. (First time is asc, second time desc and third time natural)
Execution time passed is shown during SQL execution.
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-10-25 22:12:13 UTC (rev 6700)
@@ -8,6 +8,8 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.hibernate.completion.HQLCompleteCodeAction;
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateSQLUtil;
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HqlQueryErrorUtil;
import javax.swing.*;
import javax.swing.text.JTextComponent;
@@ -25,7 +27,7 @@
private ToolsPopupController _toolsPopupController;
- public HQLEntryPanelManager(ISession session, HibernatePluginResources resources, IHibernateConnectionProvider connectionProvider)
+ public HQLEntryPanelManager(final ISession session, HibernatePluginResources resources, IHibernateConnectionProvider connectionProvider)
{
super(session);
_connectionProvider = connectionProvider;
@@ -80,17 +82,41 @@
// i18n[HQLEntryPanelManager.escapeDate=Escape date]
String strEscapeDate = s_stringMgr.getString("HQLEntryPanelManager.escapeDate");
- AbstractAction escapeDate = new AbstractAction(strUnquote)
+ AbstractAction escapeDate = new AbstractAction(strEscapeDate)
{
public void actionPerformed(ActionEvent e)
{
onEscapeDate();
}
};
- unquoteHql.putValue(Action.SHORT_DESCRIPTION, strEscapeDate);
+ escapeDate.putValue(Action.SHORT_DESCRIPTION, strEscapeDate);
addToSQLEntryAreaMenu(escapeDate, "date");
+
+ String strCopySqlToClip = s_stringMgr.getString("HQLEntryPanelManager.copySqlToClip");
+ AbstractAction copySqlToClip = new AbstractAction(strCopySqlToClip)
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onCopySqlToClip(session);
+ }
+ };
+ copySqlToClip.putValue(Action.SHORT_DESCRIPTION, strCopySqlToClip);
+ addToSQLEntryAreaMenu(copySqlToClip, "sqltoclip");
}
+ private void onCopySqlToClip(ISession session)
+ {
+ try
+ {
+ HibernateSQLUtil.copySqlToClipboard(_connectionProvider.getHibernateConnection(), getEntryPanel().getSQLToBeExecuted(), session);
+ session.showMessage(s_stringMgr.getString("HQLEntryPanelManager.copySqlToClipSucceeded"));
+ }
+ catch (Throwable t)
+ {
+ HqlQueryErrorUtil.handleHqlQueryError(t, session, true);
+ }
+ }
+
private void onEscapeDate()
{
String str = EditExtrasAccessor.escapeDate(getEntryPanel(), getSession());
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java 2012-10-25 22:12:13 UTC (rev 6700)
@@ -3,7 +3,10 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformator;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformatorConfigFactory;
+import net.sourceforge.squirrel_sql.plugins.hibernate.HibernateConnection;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
import java.util.ArrayList;
public class HibernateSQLUtil
@@ -34,4 +37,14 @@
sqls = cr.reformat(sqls) + "\n";
return sqls;
}
+
+ public static void copySqlToClipboard(HibernateConnection con, String hqlQuery, ISession session)
+ {
+ ArrayList<String> sqls = con.generateSQL(hqlQuery);
+
+ String allSqlsString = createAllSqlsString(sqls, session);
+
+ StringSelection ss = new StringSelection(allSqlsString);
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, ss);
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-10-25 22:12:13 UTC (rev 6700)
@@ -7,7 +7,6 @@
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
import net.sourceforge.squirrel_sql.plugins.hibernate.server.MappedClassInfoData;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstitute;
import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstituteRoot;
import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateSQLUtil;
@@ -18,8 +17,6 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
@@ -130,12 +127,7 @@
private void onCopySqlToClip(HibernateConnection con, String hqlQuery, ISession session)
{
- ArrayList<String> sqls = con.generateSQL(hqlQuery);
-
- String allSqlsString = HibernateSQLUtil.createAllSqlsString(sqls, session);
-
- StringSelection ss = new StringSelection(allSqlsString);
- Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, ss);
+ HibernateSQLUtil.copySqlToClipboard(con, hqlQuery, session);
}
private void initHqlQueryLabel(List objects, String hqlQuery, int numResults, int maxNumResults)
Modified: trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties 2012-10-25 22:12:13 UTC (rev 6700)
@@ -69,4 +69,7 @@
HQLEntryPanelManager.escapeDate=Escape date
-EditExtrasAccessor.editextrasPluginNeededForEscapeDate=Escape date is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.
\ No newline at end of file
+EditExtrasAccessor.editextrasPluginNeededForEscapeDate=Escape date is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.
+
+HQLEntryPanelManager.copySqlToClip=Copy SQL generated from HQL to clipboard
+HQLEntryPanelManager.copySqlToClipSucceeded=SQL generated from HQL successfully copied to clipboard
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-27 11:52:01
|
Revision: 6702
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6702&view=rev
Author: gerdwagner
Date: 2012-10-27 11:51:54 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Function to detach/close a file while keeping its contents in the SQL editor. Accessible through Toolbar and tools pop up.
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/gui/session/SQLInternalFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.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/FileDetachAction.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
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 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -446,12 +446,13 @@
add(new ExecuteSqlAction(_app));
add(new ExitAction(_app));
add(new FileNewAction(_app));
+ add(new FileDetachAction(_app));
add(new FileOpenAction(_app));
add(new FileAppendAction(_app));
add(new FileSaveAction(_app));
add(new FileSaveAsAction(_app));
- add(new FilePrintAction(_app));
- add(new FileCloseAction(_app));
+ add(new FileCloseAction(_app));
+ add(new FilePrintAction(_app));
add(new GlobalPreferencesAction(_app));
add(new GotoNextResultsTabAction(_app));
add(new GotoPreviousResultsTabAction(_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 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -433,13 +433,14 @@
private Component createFileMenu(Resources rsrc)
{
JMenu menu = rsrc.createMenu(SquirrelResources.IMenuResourceKeys.FILE);
+ addToMenu(rsrc, FileNewAction.class, menu);
+ addToMenu(rsrc, FileDetachAction.class, menu);
+ addToMenu(rsrc, FileOpenAction.class, menu);
addToMenu(rsrc, FileSaveAction.class, menu);
addToMenu(rsrc, FileSaveAsAction.class, menu);
- addToMenu(rsrc, FileOpenAction.class, menu);
- addToMenu(rsrc, FileNewAction.class, menu);
+ addToMenu(rsrc, FileCloseAction.class, menu);
addToMenu(rsrc, FileAppendAction.class, menu);
addToMenu(rsrc, FilePrintAction.class, menu);
- addToMenu(rsrc, FileCloseAction.class, menu);
return menu;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -179,12 +179,13 @@
add(actions.get(ExecuteSqlAction.class));
addSeparator();
add(actions.get(FileNewAction.class));
+ add(actions.get(FileDetachAction.class));
add(actions.get(FileOpenAction.class));
add(actions.get(FileAppendAction.class));
add(actions.get(FileSaveAction.class));
add(actions.get(FileSaveAsAction.class));
- add(actions.get(FilePrintAction.class));
- add(actions.get(FileCloseAction.class));
+ add(actions.get(FileCloseAction.class));
+ add(actions.get(FilePrintAction.class));
addSeparator();
add(actions.get(PreviousSqlAction.class));
add(actions.get(NextSqlAction.class));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -566,12 +566,13 @@
// actions.get(SQLFilterAction.class).setEnabled(false);
addSeparator();
add(actions.get(FileNewAction.class));
+ add(actions.get(FileDetachAction.class));
add(actions.get(FileOpenAction.class));
add(actions.get(FileAppendAction.class));
add(actions.get(FileSaveAction.class));
add(actions.get(FileSaveAsAction.class));
+ add(actions.get(FileCloseAction.class));
add(actions.get(FilePrintAction.class));
- add(actions.get(FileCloseAction.class));
addSeparator();
add(actions.get(PreviousSqlAction.class));
add(actions.get(NextSqlAction.class));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -293,8 +293,10 @@
void fileNew();
- void filePrint();
+ void fileDetach();
+ void filePrint();
+
void showToolsPopup();
boolean confirmClose();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -99,13 +99,14 @@
_toolsPopupController.addAction("undo", _panel.getUndoAction());
_toolsPopupController.addAction("redo", _panel.getRedoAction());
_toolsPopupController.addAction("runsql", ac.get(ExecuteSqlAction.class));
+ _toolsPopupController.addAction("filenew", ac.get(FileNewAction.class));
+ _toolsPopupController.addAction("filedetach", ac.get(FileDetachAction.class));
_toolsPopupController.addAction("fileopen", ac.get(FileOpenAction.class));
_toolsPopupController.addAction("filesave", ac.get(FileSaveAction.class));
_toolsPopupController.addAction("filesaveas", ac.get(FileSaveAsAction.class));
- _toolsPopupController.addAction("filenew", ac.get(FileNewAction.class));
_toolsPopupController.addAction("fileappend", ac.get(FileAppendAction.class));
+ _toolsPopupController.addAction("fileclose", ac.get(FileCloseAction.class));
_toolsPopupController.addAction("fileprint", ac.get(FilePrintAction.class));
- _toolsPopupController.addAction("fileclose", ac.get(FileCloseAction.class));
_toolsPopupController.addAction("tabnext", ac.get(GotoNextResultsTabAction.class));
_toolsPopupController.addAction("tabprevious", ac.get(GotoPreviousResultsTabAction.class));
@@ -196,29 +197,45 @@
/* (non-Javadoc)
* @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileClose()
*/
- public void fileClose() {
- if (unsavedEdits) {
- showConfirmSaveDialog();
- }
- setEntireSQLScript("");
- getActiveSessionTabWidget().setSqlFile(null);
- fileOpened = false;
- fileSaved = false;
- unsavedEdits = false;
- ActionCollection actions =
- getSession().getApplication().getActionCollection();
- actions.enableAction(FileSaveAction.class, true);
- _fileManager.clearCurrentFile();
+ public void fileClose()
+ {
+ _closeFile(true);
}
-
-
+
+ private void _closeFile(boolean clearEditor)
+ {
+ if (unsavedEdits)
+ {
+ showConfirmSaveDialog();
+ }
+ if (clearEditor)
+ {
+ setEntireSQLScript("");
+ }
+ getActiveSessionTabWidget().setSqlFile(null);
+ fileOpened = false;
+ fileSaved = false;
+ unsavedEdits = false;
+ ActionCollection actions =
+ getSession().getApplication().getActionCollection();
+ actions.enableAction(FileSaveAction.class, true);
+ _fileManager.clearCurrentFile();
+ }
+
+
/* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileNew()
- */
- public void fileNew() {
+ * @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileNew()
+ */
+ public void fileNew()
+ {
fileClose();
}
-
+
+ public void fileDetach()
+ {
+ _closeFile(false);
+ }
+
/* (non-Javadoc)
* @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileSaveAs()
*/
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java (from rev 6686, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileNewAction.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -0,0 +1,47 @@
+package net.sourceforge.squirrel_sql.client.session.action;
+/*
+ * Copyright (C) 2006 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
+import java.awt.event.ActionEvent;
+
+
+public class FileDetachAction extends SquirrelAction implements ISQLPanelAction
+{
+ private ISQLPanelAPI _panel;
+
+ public FileDetachAction(IApplication app)
+ {
+ super(app);
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ _panel.fileDetach();
+ }
+
+ public void setSQLPanel(ISQLPanelAPI panel)
+ {
+ _panel = panel;
+ setEnabled(null != _panel);
+ }
+}
\ No newline at end of file
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
___________________________________________________________________
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-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-10-27 11:51:54 UTC (rev 6702)
@@ -398,6 +398,10 @@
action.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.name=New file
action.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.tooltip=New file
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.image=file_detach.gif
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.name=Detach file
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.tooltip=Detach/close file while keeping editor contents
+
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.image=eclipse/open.gif
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.name=Open
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.tooltip=Open a file
@@ -822,6 +826,9 @@
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.mnemonic=N
+menuitem.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.accelerator=
+menuitem.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.mnemonic=
+
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileCloseAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileCloseAction.mnemonic=C
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-27 11:51:54 UTC (rev 6702)
@@ -8,6 +8,8 @@
Enhancements:
+Function to detach/close a file while keeping its contents in the SQL editor. Accessible through Toolbar and tools pop up.
+
Hibernate Plugin:
New function in tools pop up and right mouse menu of HQL editor: Copy SQL generated from current HQL to clipboard.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-30 21:44:32
|
Revision: 6708
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6708&view=rev
Author: gerdwagner
Date: 2012-10-30 21:44:26 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
When schema info was refreshed (using F5) the SQL editor used to color tables as undefined (error red)
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java 2012-10-30 20:14:22 UTC (rev 6707)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java 2012-10-30 21:44:26 UTC (rev 6708)
@@ -21,6 +21,8 @@
*/
import java.awt.event.ActionEvent;
+import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
+import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfoUpdateListener;
import net.sourceforge.squirrel_sql.fw.gui.CursorChanger;
import net.sourceforge.squirrel_sql.client.IApplication;
@@ -38,6 +40,7 @@
{
/** Current Object Tree. */
private ISession _session;
+ private SchemaInfoUpdateListener _schemaInfoUpdateListener;
/**
* Ctor specifying application API.
@@ -67,8 +70,32 @@
finally
{
cursorChg.restore();
+
+
+ if(null != _schemaInfoUpdateListener)
+ {
+ _session.getSchemaInfo().removeSchemaInfoUpdateListener(_schemaInfoUpdateListener);
+ }
+
+ _schemaInfoUpdateListener = new SchemaInfoUpdateListener()
+ {
+ public void schemaInfoUpdated()
+ {
+ onSchemaInfoUpdated(_session);
+ }
+ };
+
+ _session.getSchemaInfo().addSchemaInfoUpdateListener(_schemaInfoUpdateListener);
}
}
}
+
+ private void onSchemaInfoUpdated(ISession session)
+ {
+ final IParserEventsProcessor parserEventsProcessor = session.getParserEventsProcessor(_session.getSessionSheet().getSQLEntryPanel().getIdentifier());
+ parserEventsProcessor.triggerParser();
+ _session.getSchemaInfo().removeSchemaInfoUpdateListener(_schemaInfoUpdateListener);
+ _schemaInfoUpdateListener = null;
+ }
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-30 20:14:22 UTC (rev 6707)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-30 21:44:26 UTC (rev 6708)
@@ -45,6 +45,8 @@
Bug fixes:
+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
2798081 Right click on column header changes sort order
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-11-11 21:12:30
|
Revision: 6712
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6712&view=rev
Author: gerdwagner
Date: 2012-11-11 21:12:19 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
Result table search --> First step
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/mainpanel/IResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.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/overview/datascale/DataScale.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/mainpanel/I18NStrings.properties
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/PopupEditableIOPanel.java
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/resources/LibraryResources.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties
Added Paths:
-----------
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/TabButton.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/
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/DataSetFindPanelListener.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/datasetviewer/tablefind/FindMarkColor.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/FindServiceRenderCallBack.java
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/TableTraverser.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/SquirrelConstants.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/
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/resources/images/hide.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/hide_sel.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/marked_to_new_table.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/table_clean.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/table_marked.png
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-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -17,10 +17,11 @@
* 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.net.URL;
import net.sourceforge.squirrel_sql.fw.util.Resources;
+import java.net.URL;
+
public class SquirrelResources extends Resources
{
public final static int S_SPLASH_IMAGE_BACKGROUND = 0xAEB0C5;
@@ -29,7 +30,7 @@
private final String _defaultsPath;
- public interface IMenuResourceKeys
+ public interface IMenuResourceKeys
{
String ALIASES = "aliases";
String CLOSE_ALL_SQL_RESULTS = "close_all_sql_results";
@@ -93,6 +94,13 @@
String AGG_XY = "aggXy";
String AGG_MIN = "aggMin";
String AGG_MAX = "aggMax";
+
+ String ARROW_DOWN = "next_nav";
+ String ARROW_UP = "prev_nav";
+
+ String UNMARK = "unmark";
+ String TABLE = "table";
+ String HIDE = "hide";
}
public SquirrelResources(String rsrcBundleBaseName)
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-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -87,4 +87,6 @@
IIdentifier getIdentifier();
TableState getResultSortableTableState();
+
+ void toggleShowFindPanel();
}
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,103 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel;
+
+import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo;
+import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
+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 javax.swing.*;
+import java.awt.*;
+import java.text.NumberFormat;
+
+public class QueryInfoPanel extends JPanel
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(QueryInfoPanel.class);
+
+ private MultipleLineLabel _queryLbl = new MultipleLineLabel();
+ private JLabel _rowCountLbl = new JLabel();
+ private JLabel _executedLbl = new JLabel();
+ private JLabel _elapsedLbl = new JLabel();
+
+ QueryInfoPanel()
+ {
+ createGUI();
+ }
+
+ void load(int rowCount,
+ SQLExecutionInfo exInfo)
+ {
+ _queryLbl.setText(StringUtilities.cleanString(exInfo.getSQL()));
+ _rowCountLbl.setText(String.valueOf(rowCount));
+ _executedLbl.setText(exInfo.getSQLExecutionStartTime().toString());
+ _elapsedLbl.setText(formatElapsedTime(exInfo));
+ }
+
+ private String formatElapsedTime(SQLExecutionInfo exInfo)
+ {
+ final NumberFormat nbrFmt = NumberFormat.getNumberInstance();
+ double executionLength = exInfo.getSQLExecutionElapsedMillis() / 1000.0;
+ double outputLength = exInfo.getResultsProcessingElapsedMillis() / 1000.0;
+
+ String totalTime = nbrFmt.format(executionLength + outputLength);
+ String queryTime = nbrFmt.format(executionLength);
+ String outputTime = nbrFmt.format(outputLength);
+
+ // i18n[ResultTab.elapsedTime=Total: {0}, SQL query: {1}, Building output: {2}]
+ String elapsedTime =
+ s_stringMgr.getString("ResultTab.elapsedTime",
+ new String[] { totalTime,
+ queryTime,
+ outputTime});
+ return elapsedTime;
+ }
+
+ private void createGUI()
+ {
+ setLayout(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0;
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.insets = new Insets(5, 10, 5, 10);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ // i18n[ResultTab.executedLabel=Executed:]
+ String label = s_stringMgr.getString("ResultTab.executedLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ ++gbc.gridy;
+ // i18n[ResultTab.rowCountLabel=Row Count:]
+ label = s_stringMgr.getString("ResultTab.rowCountLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ ++gbc.gridy;
+ // i18n[ResultTab.statementLabel=SQL:]
+ label = s_stringMgr.getString("ResultTab.statementLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ ++gbc.gridy;
+ // i18n[ResultTab.elapsedTimeLabel=Elapsed Time (seconds):]
+ label = s_stringMgr.getString("ResultTab.elapsedTimeLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1;
+
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ add(_executedLbl, gbc);
+
+ ++gbc.gridy;
+ add(_rowCountLbl, gbc);
+
+ ++gbc.gridy;
+ add(_queryLbl, gbc);
+
+ ++gbc.gridy;
+ add(_elapsedLbl, gbc);
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -61,6 +61,7 @@
private ResultTabFactory _resultTabFactory;
private ResultFrameListener _resultFrameListener;
private JButton _btnReturnToTab;
+ private TabButton _btnToggleFind;
private JCheckBox _chkOnTop;
private JButton _btnReRun;
private JPanel _centerPanel;
@@ -117,12 +118,26 @@
}
});
+ _btnToggleFind.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onFind();
+ }
+ });
+
if (false == isOnRerun)
{
showFrame(this, false);
}
}
+ private void onFind()
+ {
+ _tab.toggleShowFindPanel();
+ }
+
private void onRerun()
{
_btnReturnToTab.setEnabled(false);
@@ -265,10 +280,15 @@
gbc = new GridBagConstraints(2,0,1,1,1,0,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0,5,0,5), 0,0);
pnlButtons.add(new JPanel(), gbc);
- ImageIcon icon = session.getApplication().getResources().getIcon(SquirrelResources.IImageNames.RERUN);
- _btnReRun = new JButton(icon);
+ ImageIcon iconFind = session.getApplication().getResources().getIcon(SquirrelResources.IImageNames.FIND);
+ _btnToggleFind = new TabButton(iconFind);
+ gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0);
+ pnlButtons.add(_btnToggleFind, gbc);
+
+ ImageIcon iconReRun = session.getApplication().getResources().getIcon(SquirrelResources.IImageNames.RERUN);
+ _btnReRun = new TabButton(iconReRun);
_btnReRun.setToolTipText(s_stringMgr.getString("ResultFrame.rerun"));
- gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,5), 0,0);
+ gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,5), 0,0);
pnlButtons.add(_btnReRun, gbc);
return pnlButtons;
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-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -24,14 +24,10 @@
*/
import java.awt.BorderLayout;
import java.awt.Component;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
import java.awt.GridLayout;
-import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.text.NumberFormat;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -40,7 +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.gui.MultipleLineLabel;
+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;
@@ -52,34 +48,35 @@
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;
public class ResultTab extends JPanel implements IHasIdentifier, IResultTab
{
- private static final long serialVersionUID = 1L;
-
/** Uniquely identifies this ResultTab. */
private IIdentifier _id;
/** Current session. */
- transient private ISession _session;
+ private ISession _session;
/** SQL Execution information. */
- transient private SQLExecutionInfo _exInfo;
+ private SQLExecutionInfo _exInfo;
/** Panel displaying the SQL results. */
- transient private IDataSetViewer _resultSetOutput;
+ private DataSetViewerFindDecorator _resultSetOutput;
/** Panel displaying the SQL results meta data. */
- transient private IDataSetViewer _metaDataOutput;
+ private IDataSetViewer _metaDataOutput;
/** Scroll pane for <TT>_resultSetOutput</TT>. */
- private JScrollPane _resultSetSp = new JScrollPane();
+ // SCROLL
+ // private JScrollPane _resultSetSp = new JScrollPane();
/** Scroll pane for <TT>_metaDataOutput</TT>. */
private JScrollPane _metaDataSp = new JScrollPane();
/** Tabbed pane containing the SQL results the the results meta data. */
- private JTabbedPane _tp;
+ private JTabbedPane _tabResultTabs;
/** <TT>SQLExecuterPanel</TT> that this tab is showing results for. */
private SQLResultExecuterPanelFacade _sqlResultExecuterPanelFacade;
@@ -96,15 +93,19 @@
/** Listener to the sessions properties. */
private PropertyChangeListener _propsListener;
- private boolean _allowEditing;
+ private boolean _allowEditing;
+
+ private IDataSetUpdateableTableModel _creator;
+
+ private ResultSetDataSet _rsds;
- transient private IDataSetUpdateableTableModel _creator;
-
- transient private ResultSetDataSet _rsds;
-
/** Internationalized strings for this class. */
- private static final StringManager s_stringMgr =
- StringManagerFactory.getStringManager(ResultTab.class);
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ResultTab.class);
+
+ private static ILogger s_log = LoggerController.createLogger(ResultTab.class);
+
+
+
private ResultTabListener _resultTabListener;
/**
@@ -169,7 +170,8 @@
if (_allowEditing)
{
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator, new DefaultDataModelImplementationDetails(_session));
+ IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator, new DefaultDataModelImplementationDetails(_session));
+ _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
}
else
@@ -179,13 +181,16 @@
// and it becomes difficult to know which table (or tables!) an
// edited column belongs to. Therefore limit the output
// to be read-only
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(
- props.getReadOnlySQLResultsOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
+ IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(
+ props.getReadOnlySQLResultsOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
+
+ _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
}
- _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- _resultSetSp.setRowHeader(null);
+ // SCROLL
+ // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
+ // _resultSetSp.setRowHeader(null);
if (_session.getProperties().getShowResultsMetaData())
{
@@ -238,10 +243,10 @@
_sql = StringUtilities.cleanString(exInfo.getSQL());
// Display the result set.
- _resultSetOutput.show(rsds, null);
+ _resultSetOutput.getDataSetViewer().show(rsds, null);
_rsds = rsds;
- final int rowCount = _resultSetOutput.getRowCount();
+ final int rowCount = _resultSetOutput.getDataSetViewer().getRowCount();
final int maxRows =_exInfo.getMaxRows();
String escapedSql = Utilities.escapeHtmlChars(_sql);
@@ -279,7 +284,7 @@
}
if (_resultSetOutput != null)
{
- _resultSetOutput.clear();
+ _resultSetOutput.getDataSetViewer().clear();
}
_exInfo = null;
_currentSqlLbl.setText("");
@@ -320,7 +325,7 @@
*/
public void closeTab()
{
- add(_tp, BorderLayout.CENTER);
+ add(_tabResultTabs, BorderLayout.CENTER);
_sqlResultExecuterPanelFacade.closeResultTab(this);
}
@@ -329,13 +334,13 @@
*/
public void returnToTabbedPane()
{
- add(_tp, BorderLayout.CENTER);
+ add(_tabResultTabs, BorderLayout.CENTER);
_sqlResultExecuterPanelFacade.returnToTabbedPane(this);
}
public Component getOutputComponent()
{
- return _tp;
+ return _tabResultTabs;
}
/**
@@ -357,7 +362,7 @@
|| evt.getPropertyName().equals(
SessionProperties.IPropertyNames.SQL_RESULTS_TAB_PLACEMENT))
{
- _tp.setTabPlacement(props.getSQLResultsTabPlacement());
+ _tabResultTabs.setTabPlacement(props.getSQLResultsTabPlacement());
}
}
@@ -370,15 +375,20 @@
{
if (_allowEditing)
{
- TableState resultSortableTableState = getTableState(_resultSetOutput);
+ TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator, new DefaultDataModelImplementationDetails(_session));
- _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- _resultSetSp.setRowHeader(null);
+ IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator, new DefaultDataModelImplementationDetails(_session));
+ // _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer);
+ _resultSetOutput.replaceDataSetViewer(dataSetViewer);
+
+ // SCROLL
+ // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
+ // _resultSetSp.setRowHeader(null);
+
_rsds.resetCursor();
- _resultSetOutput.show(_rsds, null);
+ _resultSetOutput.getDataSetViewer().show(_rsds, null);
- restoreTableState(resultSortableTableState, _resultSetOutput);
+ restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
}
else
{
@@ -393,15 +403,21 @@
String readOnlyOutput = props.getReadOnlySQLResultsOutputClassName();
- TableState resultSortableTableState = getTableState(_resultSetOutput);
+ TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator, new DefaultDataModelImplementationDetails(_session));
- _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- _resultSetSp.setRowHeader(null);
+ 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.show(_rsds, null);
+ _resultSetOutput.getDataSetViewer().show(_rsds, null);
- restoreTableState(resultSortableTableState, _resultSetOutput);
+ restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
}
}
catch (DataSetException e)
@@ -435,26 +451,27 @@
setLayout(new BorderLayout());
int sqlResultsTabPlacement = _session.getProperties().getSQLResultsTabPlacement();
- _tp = UIFactory.getInstance().createTabbedPane(sqlResultsTabPlacement);
+ _tabResultTabs = UIFactory.getInstance().createTabbedPane(sqlResultsTabPlacement);
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayout(1, 3, 0, 0));
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);
add(panel1, BorderLayout.NORTH);
- add(_tp, BorderLayout.CENTER);
+ add(_tabResultTabs, BorderLayout.CENTER);
- _resultSetSp.setBorder(BorderFactory.createEmptyBorder());
+ // SCROLL _resultSetSp.setBorder(BorderFactory.createEmptyBorder());
// i18n[ResultTab.resultsTabTitle=Results]
String resultsTabTitle =
s_stringMgr.getString("ResultTab.resultsTabTitle");
- _tp.addTab(resultsTabTitle, _resultSetSp);
+ _tabResultTabs.addTab(resultsTabTitle, _resultSetOutput.getComponent()); // SCROLL
if (_session.getProperties().getShowResultsMetaData())
{
@@ -463,7 +480,7 @@
// i18n[ResultTab.metadataTabTitle=MetaData]
String metadataTabTitle =
s_stringMgr.getString("ResultTab.metadataTabTitle");
- _tp.addTab(metadataTabTitle, _metaDataSp);
+ _tabResultTabs.addTab(metadataTabTitle, _metaDataSp);
}
final JScrollPane sp = new JScrollPane(_queryInfoPanel);
@@ -472,19 +489,19 @@
// i18n[ResultTab.infoTabTitle=Info]
String infoTabTitle =
s_stringMgr.getString("ResultTab.infoTabTitle");
- _tp.addTab(infoTabTitle, sp);
+ _tabResultTabs.addTab(infoTabTitle, sp);
- final int overViewIx = _tp.getTabCount();
+ final int overViewIx = _tabResultTabs.getTabCount();
final OverviewCtrl ctrl = new OverviewCtrl(_session);
- _tp.addTab(ctrl.getTitle(), ctrl.getPanel());
+ _tabResultTabs.addTab(ctrl.getTitle(), ctrl.getPanel());
- _tp.addChangeListener(new ChangeListener()
+ _tabResultTabs.addChangeListener(new ChangeListener()
{
- @Override
+ @Override
public void stateChanged(ChangeEvent e)
{
- if (overViewIx == _tp.getSelectedIndex())
+ if (overViewIx == _tabResultTabs.getSelectedIndex())
{
ctrl.init(_rsds);
}
@@ -493,19 +510,8 @@
}
- private final class TabButton extends JButton
+ private class CloseAction extends SquirrelAction
{
- TabButton(Action action)
- {
- super(action);
- setMargin(new Insets(0, 0, 0, 0));
- setBorderPainted(false);
- setText("");
- }
- }
-
- private class CloseAction extends SquirrelAction
- {
CloseAction()
{
super(
@@ -545,7 +551,30 @@
}
}
+ public class FindInResultAction extends SquirrelAction
+ {
+ FindInResultAction(IApplication app)
+ {
+ super(app, app.getResources());
+ }
+ public void actionPerformed(ActionEvent evt)
+ {
+ toggleShowFindPanel();
+ }
+ }
+
+ @Override
+ public void toggleShowFindPanel()
+ {
+ if(false == _resultSetOutput.toggleShowFindPanel())
+ {
+ _session.getApplication().getMessageHandler().showWarningMessage(s_stringMgr.getString("ResultTab.tableSearchNotSupported"));
+ s_log.warn(s_stringMgr.getString("ResultTab.tableSearchNotSupported"));
+ }
+ }
+
+
/**
* @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#getIdentifier()
*/
@@ -557,104 +586,13 @@
@Override
public TableState getResultSortableTableState()
{
- return _resultSetOutput.getResultSortableTableState();
+ return _resultSetOutput.getDataSetViewer().getResultSortableTableState();
}
public void applyResultSortableTableState(TableState sortableTableState)
{
- _resultSetOutput.applyResultSortableTableState(sortableTableState);
+ _resultSetOutput.getDataSetViewer().applyResultSortableTableState(sortableTableState);
}
- private static class QueryInfoPanel extends JPanel
- {
-
- private MultipleLineLabel _queryLbl = new MultipleLineLabel();
- private JLabel _rowCountLbl = new JLabel();
- private JLabel _executedLbl = new JLabel();
- private JLabel _elapsedLbl = new JLabel();
-
- QueryInfoPanel()
- {
- super();
- createGUI();
- }
-
- void load(int rowCount,
- SQLExecutionInfo exInfo)
- {
- _queryLbl.setText(StringUtilities.cleanString(exInfo.getSQL()));
- _rowCountLbl.setText(String.valueOf(rowCount));
- _executedLbl.setText(exInfo.getSQLExecutionStartTime().toString());
- _elapsedLbl.setText(formatElapsedTime(exInfo));
- }
-
- private String formatElapsedTime(SQLExecutionInfo exInfo)
- {
- final NumberFormat nbrFmt = NumberFormat.getNumberInstance();
- double executionLength = exInfo.getSQLExecutionElapsedMillis() / 1000.0;
- double outputLength = exInfo.getResultsProcessingElapsedMillis() / 1000.0;
-
- String totalTime = nbrFmt.format(executionLength + outputLength);
- String queryTime = nbrFmt.format(executionLength);
- String outputTime = nbrFmt.format(outputLength);
-
- // i18n[ResultTab.elapsedTime=Total: {0}, SQL query: {1}, Building output: {2}]
- String elapsedTime =
- s_stringMgr.getString("ResultTab.elapsedTime",
- new String[] { totalTime,
- queryTime,
- outputTime});
- return elapsedTime;
- }
-
- private void createGUI()
- {
- setLayout(new GridBagLayout());
- GridBagConstraints gbc = new GridBagConstraints();
-
- gbc.anchor = GridBagConstraints.NORTHWEST;
- gbc.gridwidth = 1;
- gbc.weightx = 0;
-
- gbc.gridx = 0;
- gbc.gridy = 0;
- gbc.insets = new Insets(5, 10, 5, 10);
- gbc.fill = GridBagConstraints.HORIZONTAL;
- // i18n[ResultTab.executedLabel=Executed:]
- String label = s_stringMgr.getString("ResultTab.executedLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- ++gbc.gridy;
- // i18n[ResultTab.rowCountLabel=Row Count:]
- label = s_stringMgr.getString("ResultTab.rowCountLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- ++gbc.gridy;
- // i18n[ResultTab.statementLabel=SQL:]
- label = s_stringMgr.getString("ResultTab.statementLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- ++gbc.gridy;
- // i18n[ResultTab.elapsedTimeLabel=Elapsed Time (seconds):]
- label = s_stringMgr.getString("ResultTab.elapsedTimeLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1;
-
- gbc.gridx = 1;
- gbc.gridy = 0;
- add(_executedLbl, gbc);
-
- ++gbc.gridy;
- add(_rowCountLbl, gbc);
-
- ++gbc.gridy;
- add(_queryLbl, gbc);
-
- ++gbc.gridy;
- add(_elapsedLbl, gbc);
- }
- }
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TabButton.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel...
[truncated message content] |
|
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.
|
|
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-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.
|
|
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-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 v...
[truncated message content] |
|
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...> - 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-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-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-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.
|
