X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=9ed2127e0ba6079c9a16cc50ee1f29e0359cb6cb;hb=HEAD;hp=1600b75871e94431d42cf8e23535f3f2bc8af293;hpb=9d614db4de3b9c8018a42c0c82eedd134af85d6c;p=jalview.git

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index 1600b75..9ed2127 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -20,13 +20,6 @@
  */
 package jalview.jbgui;
 
-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.Font;
 import java.awt.GridLayout;
@@ -43,7 +36,13 @@ import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
-import javax.swing.text.JTextComponent;
+
+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;
 
 public class GFinder extends JPanel
 {
@@ -60,12 +59,16 @@ public class GFinder extends JPanel
 
   protected JButton createFeatures;
 
+  protected JButton copyToClipboard;
+
   protected JvCacheableInputBox<String> searchBox;
 
   protected JCheckBox caseSensitive;
 
   protected JCheckBox searchDescription;
 
+  protected JCheckBox searchFeatures;
+
   protected JCheckBox ignoreHidden;
 
   public GFinder()
@@ -123,26 +126,24 @@ public class GFinder extends JPanel
      * search box
      */
     searchBox = new JvCacheableInputBox<>(FINDER_CACHE_KEY, 25);
-    searchBox.setFont(VERDANA_12);
-    ((JTextComponent) searchBox.getEditor().getEditorComponent())
-            .addCaretListener(new CaretListener()
-            {
-              @Override
-              public void caretUpdate(CaretEvent e)
-              {
-                textfield_caretUpdate();
-              }
-            });
-    searchBox.getEditor().getEditorComponent()
-            .addKeyListener(new KeyAdapter()
-            {
-              @Override
-              public void keyPressed(KeyEvent e)
-              {
-                textfield_keyPressed(e);
-              }
-            });
-    centrePanel.add(searchBox);
+    searchBox.getComponent().setFont(VERDANA_12);
+    searchBox.addCaretListener(new CaretListener()
+    {
+      @Override
+      public void caretUpdate(CaretEvent e)
+      {
+        textfield_caretUpdate();
+      }
+    });
+    searchBox.addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyPressed(KeyEvent e)
+      {
+        textfield_keyPressed(e);
+      }
+    });
+    centrePanel.add(searchBox.getComponent());
 
     /*
      * search options checkboxes
@@ -155,13 +156,18 @@ public class GFinder extends JPanel
     searchDescription
             .setText(MessageManager.getString("label.include_description"));
 
+    searchFeatures = new JCheckBox();
+    searchFeatures
+            .setText(MessageManager.getString("label.include_features"));
+
     ignoreHidden = new JCheckBox();
     ignoreHidden.setText(MessageManager.getString("label.ignore_hidden"));
     ignoreHidden.setToolTipText(
             MessageManager.getString("label.ignore_hidden_tooltip"));
-    
+
     centrePanel.add(caseSensitive);
     centrePanel.add(searchDescription);
+    centrePanel.add(searchFeatures);
     centrePanel.add(ignoreHidden);
 
     /*
@@ -201,9 +207,26 @@ public class GFinder extends JPanel
         createFeatures_actionPerformed();
       }
     });
+    copyToClipboard = new JButton();
+    copyToClipboard.setEnabled(false);
+    copyToClipboard.setFont(VERDANA_12);
+    copyToClipboard.setText(MessageManager.getString("label.copy"));
+    copyToClipboard.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        copyToClipboard_actionPerformed();
+      }
+    });
     eastPanel.add(findNext);
     eastPanel.add(findAll);
     eastPanel.add(createFeatures);
+    eastPanel.add(copyToClipboard);
+  }
+
+  protected void copyToClipboard_actionPerformed()
+  {
   }
 
   protected void textfield_keyPressed(KeyEvent e)