Thread: [Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session SessionIntern
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2007-11-25 11:19:55
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6035/app/src/net/sourceforge/squirrel_sql/client/gui/session Modified Files: SessionInternalFrame.java SessionPanel.java Log Message: Changing to another window using Alt + left/right arrow did not properly set focus. Index: SessionInternalFrame.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionInternalFrame.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SessionInternalFrame.java 22 Jun 2007 02:23:02 -0000 1.8 --- SessionInternalFrame.java 25 Nov 2007 11:19:51 -0000 1.9 *************** *** 93,122 **** - public void setSelected(boolean selected) - throws PropertyVetoException - { - super.setSelected(selected); - - // Without this when using alt left/right to move - // between sessions the focus is left in the SQL - // entry area of the previous session. - // TODO: Once Java 5 is minimum supported - // we don't need this, - if (Version.isJDK14()) - { - if (selected) - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - _sessionPanel.getSQLEntryPanel().requestFocus(); - } - }); - } - } - } ! private void createGUI(final ISession session) { setVisible(false); --- 93,98 ---- ! private void createGUI(final ISession session) { setVisible(false); *************** *** 173,177 **** public void requestFocus() { ! _sessionPanel.getSQLEntryPanel().requestFocus(); } --- 149,173 ---- public void requestFocus() { ! if (ISession.IMainPanelTabIndexes.SQL_TAB == _session.getSelectedMainTabIndex()) ! { ! SwingUtilities.invokeLater(new Runnable() ! { ! public void run() ! { ! _sessionPanel.getSQLEntryPanel().requestFocus(); ! } ! }); ! } ! else if (ISession.IMainPanelTabIndexes.OBJECT_TREE_TAB == _session.getSelectedMainTabIndex()) ! { ! SwingUtilities.invokeLater(new Runnable() ! { ! public void run() ! { ! _sessionPanel.getObjectTreePanel().requestFocus(); ! } ! }); ! } ! } Index: SessionPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** SessionPanel.java 20 Aug 2007 00:16:20 -0000 1.28 --- SessionPanel.java 25 Nov 2007 11:19:51 -0000 1.29 *************** *** 248,252 **** } ! /** * Add a tab to the main tabbed panel. * --- 248,258 ---- } ! public int getSelectedMainTabIndex() ! { ! return _mainTabPane.getTabbedPane().getSelectedIndex(); ! } ! ! ! /** * Add a tab to the main tabbed panel. * |