textfield has focus

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 2c37b44..f3a0d45 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -61,22 +61,7 @@ public class Finder extends GFinder
       frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
       Desktop.addInternalFrame(frame, "Find", 340, 110);\r
 \r
-\r
-        // all a big pain, but we need to wait until the frame is visible before the textfield can\r
-        // obtain the focus/////////////////////////\r
-        frame.addInternalFrameListener(new InternalFrameAdapter()\r
-            {\r
-                public void internalFrameOpened(InternalFrameEvent evt)\r
-                {\r
-                    SwingUtilities.invokeLater(new Runnable()\r
-                        {\r
-                            public void run()\r
-                            {\r
-                                textfield.requestFocus();\r
-                            }\r
-                        });\r
-                }\r
-            });\r
+      textfield.requestFocus();\r
     }\r
 \r
 \r

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index b9bccc0..3cbef12 100755 (executable)
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -71,7 +71,6 @@ public class GFinder
         findAll_actionPerformed(e);\r
       }\r
     });\r
-    findNext.setEnabled(false);\r
     findNext.setFont(new java.awt.Font("Verdana", 0, 12));\r
     findNext.setText("Find Next");\r
     findNext.addActionListener(new java.awt.event.ActionListener()\r
@@ -144,13 +143,11 @@ public class GFinder
 \r
   protected void textfield_keyPressed(KeyEvent e)\r
   {\r
-\r
     if(e.getKeyCode()==KeyEvent.VK_ENTER)\r
     {\r
       e.consume();\r
       findNext_actionPerformed(null);\r
     }\r
-    findNext.setEnabled(true);\r
   }\r
 \r
   public void createNewGroup_actionPerformed(ActionEvent e)\r