JAL-1648 Implemented in-memory caching for FTS (Uniprot & PDB) and Finder

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

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index fef4568..76f75e1 100755 (executable)
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -24,6 +24,8 @@ import jalview.datamodel.AlignmentI;
 import jalview.io.DataSourceType;
 import jalview.io.FileFormat;
 import jalview.io.FormatAdapter;
+import jalview.io.cache.AppCache;
+import jalview.io.cache.Cacheable;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -36,16 +38,17 @@ import java.awt.event.KeyEvent;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
 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
+public class GFinder extends JPanel implements Cacheable
 {
   JLabel jLabelFind = new JLabel();
 
@@ -59,9 +62,8 @@ public class GFinder extends JPanel
 
   protected JButton createNewGroup = new JButton();
 
-  JScrollPane jScrollPane1 = new JScrollPane();
 
-  protected JTextArea textfield = new JTextArea();
+  protected JComboBox<String> searchBox = new JComboBox<String>();
 
   BorderLayout mainBorderLayout = new BorderLayout();
 
@@ -81,6 +83,8 @@ public class GFinder extends JPanel
 
   GridLayout optionsGridLayout = new GridLayout();
 
+  private static final String FINDER_CACHE_KEY = "FINDER_CACHE_KEY";
+
   public GFinder()
   {
     try
@@ -133,10 +137,12 @@ public class GFinder extends JPanel
         createNewGroup_actionPerformed(e);
       }
     });
-    textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
-    textfield.setText("");
-    textfield.setLineWrap(true);
-    textfield.addCaretListener(new CaretListener()
+    searchBox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
+    searchBox.setEditable(true);
+    searchBox
+.setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+    ((JTextComponent) searchBox.getEditor().getEditorComponent())
+            .addCaretListener(new CaretListener()
     {
       @Override
       public void caretUpdate(CaretEvent e)
@@ -144,7 +150,8 @@ public class GFinder extends JPanel
         textfield_caretUpdate(e);
       }
     });
-    textfield.addKeyListener(new java.awt.event.KeyAdapter()
+    searchBox.getEditor().getEditorComponent()
+            .addKeyListener(new java.awt.event.KeyAdapter()
     {
       @Override
       public void keyPressed(KeyEvent e)
@@ -172,8 +179,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();
 
@@ -185,6 +191,7 @@ public class GFinder extends JPanel
     optionsPanel.add(searchDescription, null);
 
     jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
+    fireCache();
   }
 
   protected void findNext_actionPerformed(ActionEvent e)
@@ -201,6 +208,7 @@ public class GFinder extends JPanel
     {
       e.consume();
       findNext_actionPerformed(null);
+      fireCache();
     }
   }
 
@@ -210,14 +218,14 @@ public class GFinder extends JPanel
 
   public void textfield_caretUpdate(CaretEvent e)
   {
-    if (textfield.getText().indexOf(">") > -1)
+    if (searchBox.getEditor().getItem().toString().indexOf(">") > -1)
     {
       SwingUtilities.invokeLater(new Runnable()
       {
         @Override
         public void run()
         {
-          String str = textfield.getText();
+          String str = searchBox.getEditor().getItem().toString();
           AlignmentI al = null;
           try
           {
@@ -232,10 +240,40 @@ public class GFinder extends JPanel
                     jalview.util.Comparison.GapChars, al.getSequenceAt(0)
                             .getSequenceAsString());
 
-            textfield.setText(str);
+            searchBox.setSelectedItem(str);
           }
         }
       });
     }
   }
+
+
+  protected void fireCache()
+  {
+    AppCache.getInstance().updateCache(this);
+  }
+
+  @Override
+  public void init()
+  {
+    // TODO Auto-generated method stub
+  }
+
+  @Override
+  public JComboBox<String> getCacheComboBox()
+  {
+    return searchBox;
+  }
+
+  @Override
+  public String getCacheKey()
+  {
+    return FINDER_CACHE_KEY;
+  }
+
+  @Override
+  public JComponent getNextFocusableElement()
+  {
+    return this;
+  }
 }