JAL-2418 source formatting

[jalview.git] / src / jalview / jbgui / GFinder.java

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index 7e9fc30..1ea4ab5 100755 (executable)
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -24,6 +24,7 @@ import jalview.datamodel.AlignmentI;
 import jalview.io.DataSourceType;
 import jalview.io.FileFormat;
 import jalview.io.FormatAdapter;
+import jalview.io.cache.JvCacheableInputBox;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -38,12 +39,11 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
 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
 {
@@ -59,9 +59,8 @@ public class GFinder extends JPanel
 
   protected JButton createFeatures = new JButton();
 
-  JScrollPane jScrollPane1 = new JScrollPane();
-
-  protected JTextArea textfield = new JTextArea();
+  protected JvCacheableInputBox<String> searchBox = new JvCacheableInputBox<String>(
+          getCacheKey());
 
   BorderLayout mainBorderLayout = new BorderLayout();
 
@@ -81,6 +80,8 @@ public class GFinder extends JPanel
 
   GridLayout optionsGridLayout = new GridLayout();
 
+  private static final String FINDER_CACHE_KEY = "CACHE.FINDER";
+
   public GFinder()
   {
     try
@@ -133,26 +134,25 @@ public class GFinder extends JPanel
         createFeatures_actionPerformed();
       }
     });
-    textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
-    textfield.setText("");
-    textfield.setLineWrap(true);
-    textfield.addCaretListener(new CaretListener()
-    {
-      @Override
-      public void caretUpdate(CaretEvent e)
-      {
-        textfield_caretUpdate(e);
-      }
-    });
-    textfield.addKeyListener(new java.awt.event.KeyAdapter()
-    {
-      @Override
-      public void keyPressed(KeyEvent e)
-      {
-        textfield_keyPressed(e);
-      }
-    });
-
+    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.getEditor().getEditorComponent()
+            .addKeyListener(new java.awt.event.KeyAdapter()
+            {
+              @Override
+              public void keyPressed(KeyEvent e)
+              {
+                textfield_keyPressed(e);
+              }
+            });
     mainBorderLayout.setHgap(5);
     mainBorderLayout.setVgap(5);
     jPanel4.setLayout(borderLayout2);
@@ -161,8 +161,8 @@ 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);
@@ -172,8 +172,7 @@ public class GFinder extends JPanel
     this.add(jPanel2, java.awt.BorderLayout.SOUTH);
     this.add(jPanel3, java.awt.BorderLayout.NORTH);
     this.add(jPanel4, java.awt.BorderLayout.CENTER);
-    jPanel4.add(jScrollPane1, java.awt.BorderLayout.NORTH);
-    jScrollPane1.getViewport().add(textfield);
+    jPanel4.add(searchBox, java.awt.BorderLayout.NORTH);
 
     JPanel optionsPanel = new JPanel();
 
@@ -187,21 +186,24 @@ public class GFinder extends JPanel
     jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
   }
 
-  protected void findNext_actionPerformed(ActionEvent e)
+  protected void textfield_keyPressed(KeyEvent e)
   {
+    if (e.getKeyCode() == KeyEvent.VK_ENTER)
+    {
+      if (!searchBox.isPopupVisible())
+      {
+        e.consume();
+        findNext_actionPerformed(null);
+      }
+    }
   }
 
-  protected void findAll_actionPerformed(ActionEvent e)
+  protected void findNext_actionPerformed(ActionEvent e)
   {
   }
 
-  protected void textfield_keyPressed(KeyEvent e)
+  protected void findAll_actionPerformed(ActionEvent e)
   {
-    if (e.getKeyCode() == KeyEvent.VK_ENTER)
-    {
-      e.consume();
-      findNext_actionPerformed(null);
-    }
   }
 
   public void createFeatures_actionPerformed()
@@ -210,14 +212,14 @@ public class GFinder extends JPanel
 
   public void textfield_caretUpdate(CaretEvent e)
   {
-    if (textfield.getText().indexOf(">") > -1)
+    if (searchBox.getUserInput().indexOf(">") > -1)
     {
       SwingUtilities.invokeLater(new Runnable()
       {
         @Override
         public void run()
         {
-          String str = textfield.getText();
+          String str = searchBox.getUserInput();
           AlignmentI al = null;
           try
           {
@@ -229,13 +231,24 @@ 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());
 
-            textfield.setText(str);
           }
         }
       });
     }
   }
+
+  /**
+   * Returns unique key used for storing Finder cache items in the cache data
+   * structure
+   * 
+   * @return
+   */
+  public String getCacheKey()
+  {
+    return FINDER_CACHE_KEY;
+  }
+
 }