X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=eb4b9102b7fd8d422e066bc3c49f6d3bedd4a344;hb=refs%2Fheads%2Ffeature%2FJAL-3190jalviewjsChimera;hp=00b4fdc95ab943fa95a567a122da7058a3617987;hpb=51d6ad94bf0acf8c9d49dc2821e6b2067c711575;p=jalview.git

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index 00b4fdc..eb4b910 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -33,6 +33,7 @@ import java.awt.Font;
 import java.awt.GridLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -42,7 +43,6 @@ import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
-import javax.swing.text.JTextComponent;
 
 public class GFinder extends JPanel
 {
@@ -58,7 +58,8 @@ public class GFinder extends JPanel
 
   protected JButton createFeatures = new JButton();
 
-  protected JvCacheableInputBox<String> searchBox = new JvCacheableInputBox<String>(getCacheKey());
+  protected JvCacheableInputBox<String> searchBox = new JvCacheableInputBox<String>(
+          getCacheKey());
 
   BorderLayout mainBorderLayout = new BorderLayout();
 
@@ -132,17 +133,24 @@ public class GFinder extends JPanel
         createFeatures_actionPerformed();
       }
     });
-    searchBox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
-    ((JTextComponent) searchBox.getEditor().getEditorComponent())
-            .addCaretListener(new CaretListener()
-    {
-      @Override
-      public void caretUpdate(CaretEvent e)
-      {
-        textfield_caretUpdate(e);
-      }
-    });
-
+    searchBox.getComponent()
+            .setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
+    searchBox.addCaretListener(new CaretListener()
+            {
+              @Override
+              public void caretUpdate(CaretEvent e)
+              {
+                textfield_caretUpdate(e);
+              }
+            });
+    searchBox.addKeyListener(new java.awt.event.KeyAdapter()
+            {
+              @Override
+              public void keyPressed(KeyEvent e)
+              {
+                textfield_keyPressed(e);
+              }
+            });
     mainBorderLayout.setHgap(5);
     mainBorderLayout.setVgap(5);
     jPanel4.setLayout(borderLayout2);
@@ -151,18 +159,18 @@ public class GFinder extends JPanel
     caseSensitive.setHorizontalAlignment(SwingConstants.LEFT);
     caseSensitive.setText(MessageManager.getString("label.match_case"));
 
-    searchDescription.setText(MessageManager
-            .getString("label.include_description"));
+    searchDescription
+            .setText(MessageManager.getString("label.include_description"));
 
     actionsPanel.add(findNext, null);
     actionsPanel.add(findAll, null);
     actionsPanel.add(createFeatures, null);
     this.add(jLabelFind, java.awt.BorderLayout.WEST);
     this.add(actionsPanel, java.awt.BorderLayout.EAST);
-    this.add(jPanel2, java.awt.BorderLayout.SOUTH);
+    // this.add(jPanel2, java.awt.BorderLayout.SOUTH);
     this.add(jPanel3, java.awt.BorderLayout.NORTH);
     this.add(jPanel4, java.awt.BorderLayout.CENTER);
-    jPanel4.add(searchBox, java.awt.BorderLayout.NORTH);
+    jPanel4.add(searchBox.getComponent(), java.awt.BorderLayout.NORTH);
 
     JPanel optionsPanel = new JPanel();
 
@@ -176,6 +184,18 @@ public class GFinder extends JPanel
     jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
   }
 
+  protected void textfield_keyPressed(KeyEvent e)
+  {
+    if (e.getKeyCode() == KeyEvent.VK_ENTER)
+    {
+      if (!searchBox.isPopupVisible())
+      {
+        e.consume();
+        findNext_actionPerformed(null);
+      }
+    }
+  }
+
   protected void findNext_actionPerformed(ActionEvent e)
   {
   }
@@ -184,7 +204,6 @@ public class GFinder extends JPanel
   {
   }
 
-
   public void createFeatures_actionPerformed()
   {
   }
@@ -210,8 +229,8 @@ public class GFinder extends JPanel
           if (al != null && al.getHeight() > 0)
           {
             str = jalview.analysis.AlignSeq.extractGaps(
-                    jalview.util.Comparison.GapChars, al.getSequenceAt(0)
-                            .getSequenceAsString());
+                    jalview.util.Comparison.GapChars,
+                    al.getSequenceAt(0).getSequenceAsString());
 
           }
         }
@@ -219,10 +238,6 @@ public class GFinder extends JPanel
     }
   }
 
-
-
-
-
   /**
    * Returns unique key used for storing Finder cache items in the cache data
    * structure
@@ -234,6 +249,4 @@ public class GFinder extends JPanel
     return FINDER_CACHE_KEY;
   }
 
-
-
 }