[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/action ToolsPopupAc
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15819/app/src/net/sourceforge/squirrel_sql/client/session/action Modified Files: CloseAllSQLResultTabsAction.java CloseAllSQLResultTabsButCurrentAction.java CloseCurrentSQLResultTabAction.java CopyQualifiedObjectNameAction.java CopySimpleObjectNameAction.java DropSelectedTablesAction.java EditWhereColsAction.java ExecuteSqlAction.java FileOpenAction.java FileSaveAction.java FileSaveAsAction.java FilterObjectTreeAction.java GotoNextResultsTabAction.java GotoPreviousResultsTabAction.java RefreshObjectTreeAction.java RefreshObjectTreeItemAction.java SQLFilterAction.java SetDefaultCatalogAction.java ShowNativeSQLAction.java ToggleCurrentSQLResultTabStickyAction.java ViewObjectAtCursorInObjectTreeAction.java Added Files: ToolsPopupAction.java Log Message: Massive refactoring and clean up of Action handling Index: SetDefaultCatalogAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/SetDefaultCatalogAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SetDefaultCatalogAction.java 16 Aug 2004 07:07:43 -0000 1.3 --- SetDefaultCatalogAction.java 24 Jul 2005 20:54:14 -0000 1.4 *************** *** 61,64 **** --- 61,65 ---- { _tree = tree; + setEnabled(null != _tree); } Index: CloseAllSQLResultTabsAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CloseAllSQLResultTabsAction.java 16 Jun 2005 20:54:19 -0000 1.5 --- CloseAllSQLResultTabsAction.java 24 Jul 2005 20:54:13 -0000 1.6 *************** *** 51,54 **** --- 51,55 ---- { _panel = panel; + setEnabled(null != _panel); } Index: CopyQualifiedObjectNameAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/CopyQualifiedObjectNameAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CopyQualifiedObjectNameAction.java 16 Aug 2004 07:07:42 -0000 1.3 --- CopyQualifiedObjectNameAction.java 24 Jul 2005 20:54:13 -0000 1.4 *************** *** 63,66 **** --- 63,67 ---- { _tree = tree; + setEnabled(null != _tree); } Index: FileSaveAsAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/FileSaveAsAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileSaveAsAction.java 12 Jun 2005 12:35:52 -0000 1.1 --- FileSaveAsAction.java 24 Jul 2005 20:54:13 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- { _panel = panel; + setEnabled(null != _panel); } } Index: EditWhereColsAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/EditWhereColsAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EditWhereColsAction.java 16 Aug 2004 07:07:42 -0000 1.2 --- EditWhereColsAction.java 24 Jul 2005 20:54:13 -0000 1.3 *************** *** 57,60 **** --- 57,62 ---- { _tree = tree; + setEnabled(null != _tree); + } Index: FileOpenAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/FileOpenAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileOpenAction.java 12 Jun 2005 12:35:52 -0000 1.1 --- FileOpenAction.java 24 Jul 2005 20:54:13 -0000 1.2 *************** *** 25,28 **** --- 25,29 ---- { _panel = panel; + setEnabled(null != _panel); } } \ No newline at end of file Index: RefreshObjectTreeItemAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RefreshObjectTreeItemAction.java 16 Aug 2004 07:07:43 -0000 1.4 --- RefreshObjectTreeItemAction.java 24 Jul 2005 20:54:14 -0000 1.5 *************** *** 49,52 **** --- 49,53 ---- { _tree = tree; + setEnabled(null != _tree); } Index: ViewObjectAtCursorInObjectTreeAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/ViewObjectAtCursorInObjectTreeAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ViewObjectAtCursorInObjectTreeAction.java 18 Jul 2005 20:06:59 -0000 1.2 --- ViewObjectAtCursorInObjectTreeAction.java 24 Jul 2005 20:54:14 -0000 1.3 *************** *** 35,38 **** --- 35,39 ---- { _panel = panel; + setEnabled(null != _panel && _panel.isInMainSessionWindow()); } Index: GotoPreviousResultsTabAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/GotoPreviousResultsTabAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GotoPreviousResultsTabAction.java 16 Aug 2004 07:07:42 -0000 1.3 --- GotoPreviousResultsTabAction.java 24 Jul 2005 20:54:13 -0000 1.4 *************** *** 62,65 **** --- 62,66 ---- _panel = panel; _cmd = null; + setEnabled(null != _panel); } Index: CloseAllSQLResultTabsButCurrentAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsButCurrentAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CloseAllSQLResultTabsButCurrentAction.java 3 Jul 2005 10:19:33 -0000 1.1 --- CloseAllSQLResultTabsButCurrentAction.java 24 Jul 2005 20:54:13 -0000 1.2 *************** *** 29,32 **** --- 29,33 ---- { _panel = panel; + setEnabled(null != _panel); } Index: SQLFilterAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/SQLFilterAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SQLFilterAction.java 16 Aug 2004 07:07:43 -0000 1.3 --- SQLFilterAction.java 24 Jul 2005 20:54:14 -0000 1.4 *************** *** 64,67 **** --- 64,68 ---- { _tree = tree; + setEnabled(null != _tree); } Index: ShowNativeSQLAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ShowNativeSQLAction.java 16 Aug 2004 07:07:43 -0000 1.5 --- ShowNativeSQLAction.java 24 Jul 2005 20:54:14 -0000 1.6 *************** *** 51,54 **** --- 51,55 ---- { _panel = panel; + setEnabled(null != _panel); } Index: ExecuteSqlAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/ExecuteSqlAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExecuteSqlAction.java 16 Aug 2004 07:07:42 -0000 1.3 --- ExecuteSqlAction.java 24 Jul 2005 20:54:13 -0000 1.4 *************** *** 43,46 **** --- 43,47 ---- { _panel = panel; + setEnabled(null != _panel); } --- NEW FILE: ToolsPopupAction.java --- package net.sourceforge.squirrel_sql.client.session.action; /* * Copyright (C) 2001-2004 Colin Bell * co...@us... * * Modifications Copyright (C) 2003-2004 Jason Height * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import java.awt.event.ActionEvent; import net.sourceforge.squirrel_sql.fw.gui.CursorChanger; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; /** * This <CODE>Action</CODE> allows the user to close all the SQL * result tabs for the current session. * * @author <A HREF="mailto:co...@us...">Colin Bell</A> */ public class ToolsPopupAction extends SquirrelAction implements ISQLPanelAction { private ISQLPanelAPI _panel; /** * Ctor. * * @param app Application API. */ public ToolsPopupAction(IApplication app) { super(app); } public void setSQLPanel(ISQLPanelAPI panel) { _panel = panel; setEnabled(null != panel); } /** * Perform this action. Use the <TT>CloseAllSQLResultTabsCommand</TT>. * * @param evt The current event. */ public void actionPerformed(ActionEvent evt) { if(null == _panel) { return; } _panel.showToolsPopup(); } } Index: FileSaveAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/FileSaveAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileSaveAction.java 12 Jun 2005 12:35:52 -0000 1.1 --- FileSaveAction.java 24 Jul 2005 20:54:13 -0000 1.2 *************** *** 10,14 **** public class FileSaveAction extends SquirrelAction implements ISQLPanelAction { ! private ISQLPanelAPI m_panel; public FileSaveAction(IApplication app) --- 10,14 ---- public class FileSaveAction extends SquirrelAction implements ISQLPanelAction { ! private ISQLPanelAPI _panel; public FileSaveAction(IApplication app) *************** *** 19,28 **** public void actionPerformed(ActionEvent e) { ! m_panel.fileSave(); } public void setSQLPanel(ISQLPanelAPI panel) { ! m_panel = panel; } } --- 19,29 ---- public void actionPerformed(ActionEvent e) { ! _panel.fileSave(); } public void setSQLPanel(ISQLPanelAPI panel) { ! _panel = panel; ! setEnabled(null != _panel); } } Index: CloseCurrentSQLResultTabAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/CloseCurrentSQLResultTabAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CloseCurrentSQLResultTabAction.java 12 Jul 2005 19:02:10 -0000 1.1 --- CloseCurrentSQLResultTabAction.java 24 Jul 2005 20:54:13 -0000 1.2 *************** *** 29,32 **** --- 29,33 ---- { _panel = panel; + setEnabled(null != _panel); } Index: ToggleCurrentSQLResultTabStickyAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/ToggleCurrentSQLResultTabStickyAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ToggleCurrentSQLResultTabStickyAction.java 3 Jul 2005 12:15:16 -0000 1.1 --- ToggleCurrentSQLResultTabStickyAction.java 24 Jul 2005 20:54:14 -0000 1.2 *************** *** 29,32 **** --- 29,33 ---- { _panel = panel; + setEnabled(null != _panel); } Index: DropSelectedTablesAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/DropSelectedTablesAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DropSelectedTablesAction.java 22 May 2005 11:14:59 -0000 1.8 --- DropSelectedTablesAction.java 24 Jul 2005 20:54:13 -0000 1.9 *************** *** 61,64 **** --- 61,65 ---- { _tree = tree; + setEnabled(null != _tree); } Index: FilterObjectTreeAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/FilterObjectTreeAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FilterObjectTreeAction.java 16 Aug 2004 07:07:42 -0000 1.4 --- FilterObjectTreeAction.java 24 Jul 2005 20:54:13 -0000 1.5 *************** *** 63,66 **** --- 63,67 ---- { _tree = tree; + setEnabled(null != _tree); } Index: RefreshObjectTreeAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RefreshObjectTreeAction.java 16 Aug 2004 07:07:43 -0000 1.4 --- RefreshObjectTreeAction.java 24 Jul 2005 20:54:13 -0000 1.5 *************** *** 49,52 **** --- 49,53 ---- { _tree = tree; + setEnabled(null != _tree); } Index: GotoNextResultsTabAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/GotoNextResultsTabAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GotoNextResultsTabAction.java 16 Aug 2004 07:07:42 -0000 1.3 --- GotoNextResultsTabAction.java 24 Jul 2005 20:54:13 -0000 1.4 *************** *** 62,65 **** --- 62,66 ---- _panel = panel; _cmd = null; + setEnabled(null != _panel); } Index: CopySimpleObjectNameAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/CopySimpleObjectNameAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CopySimpleObjectNameAction.java 16 Aug 2004 07:07:42 -0000 1.3 --- CopySimpleObjectNameAction.java 24 Jul 2005 20:54:13 -0000 1.4 *************** *** 61,64 **** --- 61,65 ---- { _tree = tree; + setEnabled(null != _tree); } |