Copy and paste uses FASTA format

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

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