[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5907] trunk/sql12
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: <ger...@us...> - 2010-10-05 17:59:37
|
Revision: 5907 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5907&view=rev Author: gerdwagner Date: 2010-10-05 17:59:31 +0000 (Tue, 05 Oct 2010) Log Message: ----------- Bug fix: Double click in Alias tree always opened the selected Alias even if the mouse pointer wasn't placed on the Alias. This way Aliases where opened when tree nodes where quickly closed or opened. Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesList.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesListInternalFrame.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/BaseListInternalFrame.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DriversListInternalFrame.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/IAliasesList.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JListAliasesListImpl.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AliasPropertiesAction.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasAction.java trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasAction.java trunk/sql12/doc/src/main/resources/changes.txt Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesList.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesList.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesList.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -4,6 +4,7 @@ import javax.swing.*; import java.awt.*; +import java.awt.event.MouseEvent; import java.awt.event.MouseListener; /* @@ -98,10 +99,11 @@ /** * Return the <TT>ISQLAlias</TT> that is currently selected. - */ - public SQLAlias getSelectedAlias() + * @param evt + */ + public SQLAlias getSelectedAlias(MouseEvent evt) { - return getCurrentImpl().getSelectedAlias(); + return getCurrentImpl().getSelectedAlias(evt); } public void sortAliases() Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesListInternalFrame.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesListInternalFrame.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/AliasesListInternalFrame.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -37,6 +37,7 @@ import java.awt.event.ActionEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; +import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyVetoException; @@ -279,10 +280,10 @@ return s_stringMgr.getString("AliasesListInternalFrame.windowtitle"); } - public ICommand getDoubleClickCommand() + public ICommand getDoubleClickCommand(MouseEvent evt) { ICommand cmd = null; - SQLAlias alias = _aliasesList.getSelectedAlias(); + SQLAlias alias = _aliasesList.getSelectedAlias(evt); if (alias != null) { cmd = new ConnectToAliasCommand(_app, alias); Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/BaseListInternalFrame.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/BaseListInternalFrame.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/BaseListInternalFrame.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -43,7 +43,7 @@ BasePopupMenu getPopupMenu(); IBaseList getList(); String getWindowTitle(); - ICommand getDoubleClickCommand(); + ICommand getDoubleClickCommand(MouseEvent evt); SquirrelPreferences getPreferences(); } @@ -133,7 +133,7 @@ { if (evt.getClickCount() == 2) { - ICommand cmd = _uiFactory.getDoubleClickCommand(); + ICommand cmd = _uiFactory.getDoubleClickCommand(evt); if (cmd != null) { try Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DriversListInternalFrame.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DriversListInternalFrame.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DriversListInternalFrame.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -17,6 +17,7 @@ * 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.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.VetoableChangeListener; @@ -34,7 +35,6 @@ import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.WidgetAdapter; import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.WidgetEvent; -import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DesktopStyle; import net.sourceforge.squirrel_sql.client.action.ActionCollection; import net.sourceforge.squirrel_sql.client.mainframe.action.CopyDriverAction; import net.sourceforge.squirrel_sql.client.mainframe.action.CreateDriverAction; @@ -191,7 +191,7 @@ return s_stringMgr.getString("DriversListInternalFrame.windowtitle"); } - public ICommand getDoubleClickCommand() + public ICommand getDoubleClickCommand(MouseEvent evt) { ICommand cmd = null; ISQLDriver driver = _driversList.getSelectedDriver(); Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/IAliasesList.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/IAliasesList.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/IAliasesList.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -1,5 +1,7 @@ package net.sourceforge.squirrel_sql.client.gui.db; +import java.awt.event.MouseEvent; + /* * Copyright (C) 2004 Colin Bell * co...@us... @@ -23,8 +25,9 @@ { /** * Return the <TT>ISQLAlias</TT> that is currently selected. - */ - public SQLAlias getSelectedAlias(); + * @param evt + */ + public SQLAlias getSelectedAlias(MouseEvent evt); void sortAliases(); Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JListAliasesListImpl.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JListAliasesListImpl.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JListAliasesListImpl.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -108,15 +108,16 @@ /** * Return the <TT>ISQLAlias</TT> that is currently selected. - */ - public SQLAlias getSelectedAlias() + * @param evt + */ + public SQLAlias getSelectedAlias(MouseEvent evt) { return (SQLAlias)getList().getSelectedValue(); } public void sortAliases() { - final ISQLAlias selectedAlias = getSelectedAlias(); + final ISQLAlias selectedAlias = getSelectedAlias(null); _model.sortAliases(); Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -459,7 +459,7 @@ _tree.setSelectionPath(new TreePath(treeModel.getPathToRoot(newNode))); } - public SQLAlias getSelectedAlias() + public SQLAlias getSelectedAlias(MouseEvent evt) { TreePath path = _tree.getSelectionPath(); @@ -473,6 +473,12 @@ return null; } + if(null != evt && false == _tree.getPathBounds(path).contains(evt.getPoint())) + { + // If the mouse wasn't placed on the selected Alias we do nothing. + return null; + } + DefaultMutableTreeNode tn = (DefaultMutableTreeNode) path.getLastPathComponent(); if(false == tn.getUserObject() instanceof ISQLAlias) Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AliasPropertiesAction.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AliasPropertiesAction.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AliasPropertiesAction.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -19,7 +19,7 @@ public void actionPerformed(ActionEvent e) { - ISQLAlias selectedAlias = _aliasList.getSelectedAlias(); + ISQLAlias selectedAlias = _aliasList.getSelectedAlias(null); if(null == selectedAlias) { Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasAction.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasAction.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasAction.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -58,7 +58,7 @@ public void actionPerformed(ActionEvent evt) { moveToFrontAndSelectAliasFrame(); - final SQLAlias alias = _aliases.getSelectedAlias(); + final SQLAlias alias = _aliases.getSelectedAlias(null); if (alias != null) { new ConnectToAliasCommand(getApplication(), alias).execute(); Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasAction.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasAction.java 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasAction.java 2010-10-05 17:59:31 UTC (rev 5907) @@ -65,7 +65,7 @@ public void actionPerformed(ActionEvent evt) { moveToFrontAndSelectAliasFrame(); - SQLAlias alias = _aliases.getSelectedAlias(); + SQLAlias alias = _aliases.getSelectedAlias(null); if (alias != null) { new CopyAliasCommand(getApplication(), alias).execute(); Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2010-10-05 01:03:08 UTC (rev 5906) +++ trunk/sql12/doc/src/main/resources/changes.txt 2010-10-05 17:59:31 UTC (rev 5907) @@ -34,6 +34,9 @@ Bug-fixes: +Double click in Alias tree always opened the selected Alias even if the mouse pointer wasn't placed on the Alias. + This way Aliases where opened when tree nodes where quickly closed or opened. + RSyntax editor: Replace dialog: Replace button now does a find next after replacing. Fixed problem with sorting after dragging columns This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |