X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=382b33a44f43698f94483b70f5e53d75503e9df9;hb=acedfd8c93a1d897e2441714d5d4af487e57d14c;hp=5143e746e1f4997651cdc025841d4fd3ababaaff;hpb=f5c630601eccc201dd73f34227acf97f59a9168f;p=jalview.git

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index 5143e74..382b33a 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -22,6 +22,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
+import jalview.io.FormatAdapter;
+import jalview.datamodel.SequenceI;
 
 public class GFinder
     extends JPanel
@@ -140,8 +142,10 @@ public class GFinder
 
   protected void textfield_keyPressed(KeyEvent e)
   {
+
     if(e.getKeyCode()==KeyEvent.VK_ENTER)
     {
+      e.consume();
       findNext_actionPerformed(null);
     }
     findNext.setEnabled(true);
@@ -153,17 +157,23 @@ public class GFinder
 
   public void textfield_caretUpdate(CaretEvent e)
   {
-    if (textfield.getText().indexOf("\t") > -1)
+    if (textfield.getText().indexOf(">") > -1)
     {
       SwingUtilities.invokeLater(new Runnable()
       {
         public void run()
         {
-          String text = textfield.getText();
-          text = text.substring(text.lastIndexOf("\t") + 1).trim();
-          text = jalview.analysis.AlignSeq.extractGaps(
-              jalview.util.Comparison.GapChars, text);
-          textfield.setText(text);
+          String str = textfield.getText();
+          SequenceI[] sequences = null;
+          try{sequences = new FormatAdapter().readFile(str, "Paste", "FASTA");}
+          catch(Exception ex){}
+          if(sequences!=null && sequences.length>0)
+          {
+            str = jalview.analysis.AlignSeq.extractGaps(
+                jalview.util.Comparison.GapChars, sequences[0].getSequence());
+
+            textfield.setText(str);
+          }
         }
       });
     }