[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session SessionInternalFrame.java, 1.6, 1.6.4.1

[Colin B. <co...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27745

Modified Files:
      Tag: squirrel-2_3-final_branch
	SessionInternalFrame.java 
Log Message:
Applied 1595913: Cannot select SQL dropdown under java 6 from HEAD

Index: SessionInternalFrame.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionInternalFrame.java,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** SessionInternalFrame.java	28 Feb 2006 03:34:38 -0000	1.6
--- SessionInternalFrame.java	16 Nov 2006 22:11:28 -0000	1.6.4.1
***************
*** 32,35 ****
--- 32,36 ----
  
  import net.sourceforge.squirrel_sql.client.IApplication;
+ import net.sourceforge.squirrel_sql.client.Version;
  import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
  import net.sourceforge.squirrel_sql.client.session.IObjectTreeInternalFrame;
***************
*** 98,110 ****
  		// between sessions the focus is left in the SQL
  		// entry area of the previous session.
! 		if (selected)
! 		{
! 			SwingUtilities.invokeLater(new Runnable()
! 			{
! 				public void run()
! 				{
! 					_sessionPanel.getSQLEntryPanel().requestFocus();
! 				}
! 			});
  		}
  	}
--- 99,116 ----
  		// 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();
!         			}
!         		});
!         	}
  		}
  	}