From baa67039bb8cd4236ac4565a62291c0ba6366c07 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 6 Dec 2006 14:10:59 +0000
Subject: [PATCH] textfield has focus

---
 src/jalview/gui/Finder.java    |   17 +----------------
 src/jalview/jbgui/GFinder.java |    3 ---
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 2c37b44..f3a0d45 100755
--- 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);
       Desktop.addInternalFrame(frame, "Find", 340, 110);
 
-
-        // all a big pain, but we need to wait until the frame is visible before the textfield can
-        // obtain the focus/////////////////////////
-        frame.addInternalFrameListener(new InternalFrameAdapter()
-            {
-                public void internalFrameOpened(InternalFrameEvent evt)
-                {
-                    SwingUtilities.invokeLater(new Runnable()
-                        {
-                            public void run()
-                            {
-                                textfield.requestFocus();
-                            }
-                        });
-                }
-            });
+      textfield.requestFocus();
     }
 
 
diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index b9bccc0..3cbef12 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -71,7 +71,6 @@ public class GFinder
         findAll_actionPerformed(e);
       }
     });
-    findNext.setEnabled(false);
     findNext.setFont(new java.awt.Font("Verdana", 0, 12));
     findNext.setText("Find Next");
     findNext.addActionListener(new java.awt.event.ActionListener()
@@ -144,13 +143,11 @@ public class GFinder
 
   protected void textfield_keyPressed(KeyEvent e)
   {
-
     if(e.getKeyCode()==KeyEvent.VK_ENTER)
     {
       e.consume();
       findNext_actionPerformed(null);
     }
-    findNext.setEnabled(true);
   }
 
   public void createNewGroup_actionPerformed(ActionEvent e)
-- 
1.7.10.2