X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=c0b5d0e076a529030ae20f67cd922b59e4220dd5;hb=b437b816507d2acc59e34f70a9cf8c7f81921681;hp=b7cd2e8ac26f350ff5f183444fa92e7205e56e8f;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index b7cd2e8..c0b5d0e 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -1,73 +1,66 @@
 /*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program 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 2
-* of the License, or (at your option) any later version.
-*
-* This program 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 this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.jbgui;
 
-import javax.swing.*;
 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
+public class GFinder
+    extends JPanel
 {
   JLabel jLabel1 = new JLabel();
-  protected JTextField textfield = new JTextField();
   protected JButton findAll = new JButton();
   protected JButton findNext = new JButton();
   JPanel jPanel1 = new JPanel();
   GridLayout gridLayout1 = new GridLayout();
   protected JButton createNewGroup = new JButton();
-
+  JScrollPane jScrollPane1 = new JScrollPane();
+  protected JTextArea textfield = new JTextArea();
+  BorderLayout borderLayout1 = new BorderLayout();
+  JPanel jPanel2 = new JPanel();
+  JPanel jPanel3 = new JPanel();
+  JPanel jPanel4 = new JPanel();
+  BorderLayout borderLayout2 = new BorderLayout();
+  JPanel jPanel5 = new JPanel();
+  JPanel jPanel6 = new JPanel();
   public GFinder()
   {
     try
     {
       jbInit();
     }
-    catch(Exception e)
+    catch (Exception e)
     {
       e.printStackTrace();
     }
   }
-  private void jbInit() throws Exception
+
+  private void jbInit()
+      throws Exception
   {
     jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
     jLabel1.setText("Find");
-    jLabel1.setBounds(new Rectangle(3, 30, 34, 15));
-    this.setLayout(null);
-    textfield.setFont(new java.awt.Font("Verdana", 0, 12));
-    textfield.setText("");
-    textfield.setBounds(new Rectangle(40, 27, 133, 21));
-    textfield.addKeyListener(new java.awt.event.KeyAdapter()
-    {
-      public void keyTyped(KeyEvent e)
-      {
-        textfield_keyTyped(e);
-      }
-    });
-    textfield.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        textfield_actionPerformed(e);
-      }
-    });
+    this.setLayout(borderLayout1);
     findAll.setFont(new java.awt.Font("Verdana", 0, 12));
     findAll.setText("Find all");
     findAll.addActionListener(new java.awt.event.ActionListener()
@@ -87,7 +80,6 @@ public class GFinder extends JPanel
         findNext_actionPerformed(e);
       }
     });
-    jPanel1.setBounds(new Rectangle(180, 5, 141, 64));
     jPanel1.setLayout(gridLayout1);
     gridLayout1.setHgap(0);
     gridLayout1.setRows(3);
@@ -96,7 +88,7 @@ public class GFinder extends JPanel
     createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12));
     createNewGroup.setToolTipText("");
     createNewGroup.setMargin(new Insets(0, 0, 0, 0));
-    createNewGroup.setText("Create new group");
+    createNewGroup.setText("New Feature");
     createNewGroup.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -104,38 +96,86 @@ 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()
+    {
+      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);
+    jPanel4.setLayout(borderLayout2);
+    jPanel2.setPreferredSize(new Dimension(10, 1));
+    jPanel3.setPreferredSize(new Dimension(10, 1));
     jPanel1.add(findNext, null);
     jPanel1.add(findAll, null);
     jPanel1.add(createNewGroup, null);
-    this.add(textfield, null);
-    this.add(jLabel1, null);
-    this.add(jPanel1, null);
+    this.add(jLabel1, java.awt.BorderLayout.WEST);
+    this.add(jPanel1, 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);
+    jPanel4.add(jPanel5, java.awt.BorderLayout.SOUTH);
+    jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);
+    jScrollPane1.getViewport().add(textfield);
   }
 
   protected void findNext_actionPerformed(ActionEvent e)
   {
-
   }
 
   protected void findAll_actionPerformed(ActionEvent e)
   {
-
   }
 
 
-  protected void textfield_actionPerformed(ActionEvent e)
+  protected void textfield_keyPressed(KeyEvent e)
   {
 
-  }
-
-  void textfield_keyTyped(KeyEvent e)
-  {
+    if(e.getKeyCode()==KeyEvent.VK_ENTER)
+    {
+      e.consume();
+      findNext_actionPerformed(null);
+    }
     findNext.setEnabled(true);
   }
 
   public void createNewGroup_actionPerformed(ActionEvent e)
   {
-
   }
 
+  public void textfield_caretUpdate(CaretEvent e)
+  {
+    if (textfield.getText().indexOf(">") > -1)
+    {
+      SwingUtilities.invokeLater(new Runnable()
+      {
+        public void run()
+        {
+          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);
+          }
+        }
+      });
+    }
+  }
 }