X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=c335b33d376309a76eef6dfad6318b9214817e2f;hb=1ed483c88a51302e76fcba18f685497b6307f1b3;hp=40d6a514f46c41fe7a8988e024557f808e36590d;hpb=4cea7a0328724b90a6a7c16ae8c926e0cc12cedd;p=jalview.git

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index 40d6a51..c335b33 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -1,50 +1,67 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.jbgui;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
-import jalview.datamodel.*;
-import jalview.io.*;
+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;
+import java.awt.Dimension;
+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;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+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
 {
-  JLabel jLabel1 = new JLabel();
+  JLabel jLabelFind = new JLabel();
 
   protected JButton findAll = new JButton();
 
   protected JButton findNext = new JButton();
 
-  JPanel jPanel1 = new JPanel();
+  JPanel actionsPanel = new JPanel();
 
   GridLayout gridLayout1 = new GridLayout();
 
-  protected JButton createNewGroup = new JButton();
+  protected JButton createFeatures = new JButton();
 
-  JScrollPane jScrollPane1 = new JScrollPane();
+  protected JvCacheableInputBox<String> searchBox = new JvCacheableInputBox<String>(getCacheKey());
 
-  protected JTextArea textfield = new JTextArea();
-
-  BorderLayout borderLayout1 = new BorderLayout();
+  BorderLayout mainBorderLayout = new BorderLayout();
 
   JPanel jPanel2 = new JPanel();
 
@@ -58,6 +75,12 @@ public class GFinder extends JPanel
 
   protected JCheckBox caseSensitive = new JCheckBox();
 
+  protected JCheckBox searchDescription = new JCheckBox();
+
+  GridLayout optionsGridLayout = new GridLayout();
+
+  private static final String FINDER_CACHE_KEY = "CACHE.FINDER";
+
   public GFinder()
   {
     try
@@ -71,13 +94,14 @@ public class GFinder extends JPanel
 
   private void jbInit() throws Exception
   {
-    jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
-    jLabel1.setText(MessageManager.getString("action.find"));
-    this.setLayout(borderLayout1);
+    jLabelFind.setFont(new java.awt.Font("Verdana", 0, 12));
+    jLabelFind.setText(MessageManager.getString("label.find"));
+    this.setLayout(mainBorderLayout);
     findAll.setFont(new java.awt.Font("Verdana", 0, 12));
     findAll.setText(MessageManager.getString("action.find_all"));
     findAll.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         findAll_actionPerformed(e);
@@ -87,99 +111,120 @@ public class GFinder extends JPanel
     findNext.setText(MessageManager.getString("action.find_next"));
     findNext.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         findNext_actionPerformed(e);
       }
     });
-    jPanel1.setLayout(gridLayout1);
+    actionsPanel.setLayout(gridLayout1);
     gridLayout1.setHgap(0);
     gridLayout1.setRows(3);
     gridLayout1.setVgap(2);
-    createNewGroup.setEnabled(false);
-    createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12));
-    createNewGroup.setMargin(new Insets(0, 0, 0, 0));
-    createNewGroup.setText(MessageManager.getString("label.new_feature"));
-    createNewGroup.addActionListener(new java.awt.event.ActionListener()
+    createFeatures.setEnabled(false);
+    createFeatures.setFont(new java.awt.Font("Verdana", 0, 12));
+    createFeatures.setMargin(new Insets(0, 0, 0, 0));
+    createFeatures.setText(MessageManager.getString("label.new_feature"));
+    createFeatures.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
-        createNewGroup_actionPerformed(e);
+        createFeatures_actionPerformed();
       }
     });
-    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));
+    ((JTextComponent) searchBox.getEditor().getEditorComponent())
+            .addCaretListener(new CaretListener()
     {
+      @Override
       public void caretUpdate(CaretEvent e)
       {
         textfield_caretUpdate(e);
       }
     });
-    textfield.addKeyListener(new java.awt.event.KeyAdapter()
-    {
-      public void keyPressed(KeyEvent e)
-      {
-        textfield_keyPressed(e);
-      }
-    });
-
-    borderLayout1.setHgap(5);
-    borderLayout1.setVgap(5);
+    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);
     jPanel2.setPreferredSize(new Dimension(10, 1));
     jPanel3.setPreferredSize(new Dimension(10, 1));
     caseSensitive.setHorizontalAlignment(SwingConstants.LEFT);
     caseSensitive.setText(MessageManager.getString("label.match_case"));
-    jPanel1.add(findNext, null);
-    jPanel1.add(findAll, null);
-    jPanel1.add(createNewGroup, null);
-    this.add(jLabel1, java.awt.BorderLayout.WEST);
-    this.add(jPanel1, java.awt.BorderLayout.EAST);
+
+    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(jPanel3, java.awt.BorderLayout.NORTH);
     this.add(jPanel4, java.awt.BorderLayout.CENTER);
-    jPanel4.add(jScrollPane1, java.awt.BorderLayout.CENTER);
-    jScrollPane1.getViewport().add(textfield);
-    jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);
-    jPanel4.add(caseSensitive, java.awt.BorderLayout.SOUTH);
-  }
+    jPanel4.add(searchBox, java.awt.BorderLayout.NORTH);
 
-  protected void findNext_actionPerformed(ActionEvent e)
-  {
-  }
+    JPanel optionsPanel = new JPanel();
 
-  protected void findAll_actionPerformed(ActionEvent e)
-  {
+    optionsGridLayout.setHgap(0);
+    optionsGridLayout.setRows(2);
+    optionsGridLayout.setVgap(2);
+    optionsPanel.setLayout(optionsGridLayout);
+    optionsPanel.add(caseSensitive, null);
+    optionsPanel.add(searchDescription, null);
+
+    jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
   }
 
   protected void textfield_keyPressed(KeyEvent e)
   {
     if (e.getKeyCode() == KeyEvent.VK_ENTER)
     {
-      e.consume();
-      findNext_actionPerformed(null);
+      if (!searchBox.isPopupVisible())
+      {
+        e.consume();
+        findNext_actionPerformed(null);
+      }
     }
   }
 
-  public void createNewGroup_actionPerformed(ActionEvent e)
+  protected void findNext_actionPerformed(ActionEvent e)
+  {
+  }
+
+  protected void findAll_actionPerformed(ActionEvent e)
+  {
+  }
+
+
+  public void createFeatures_actionPerformed()
   {
   }
 
   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();
-          Alignment al = null;
+          String str = searchBox.getUserInput();
+          AlignmentI al = null;
           try
           {
-            al = new FormatAdapter().readFile(str, "Paste", "FASTA");
+            al = new FormatAdapter().readFile(str, DataSourceType.PASTE,
+                    FileFormat.Fasta);
           } catch (Exception ex)
           {
           }
@@ -189,10 +234,27 @@ public class GFinder extends JPanel
                     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;
+  }
+
+
+
 }