X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=e5c94bd5b90e0e41d4ff3443695ad443706eb67f;hb=7e129811d6ff01074428462284dffc2a6c2395a4;hp=1aceb80e734677eb339ee9ef8aa175d27ab08fc8;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 1aceb80..e5c94bd 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -87,15 +87,6 @@ public class Finder extends GFinder
             });
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void textfield_actionPerformed(ActionEvent e)
-    {
-        doSearch(false);
-    }
 
     /**
      * DOCUMENT ME!
@@ -189,7 +180,7 @@ public class Finder extends GFinder
     {
         createNewGroup.setEnabled(false);
 
-        String searchString = textfield.getText().toUpperCase();
+        String searchString = textfield.getText().toUpperCase().trim();
 
         com.stevesoft.pat.Regex regex = new com.stevesoft.pat.Regex(searchString);
 
@@ -206,19 +197,18 @@ public class Finder extends GFinder
         {
             int res = Integer.parseInt(searchString);
             found = true;
-
-            if (av.getSelectionGroup().getSize() > 0)
+            if (av.getSelectionGroup() == null || av.getSelectionGroup().getSize() < 1)
             {
-                seq = (Sequence) (av.getSelectionGroup().getSequenceAt(0));
+              seq = (Sequence) av.getAlignment().getSequenceAt(0);
             }
             else
             {
-                seq = (Sequence) av.getAlignment().getSequenceAt(0);
+              seq = (Sequence) (av.getSelectionGroup().getSequenceAt(0));
             }
 
             searchResults.add(Integer.toString(av.getAlignment().findIndex(seq)));
-            searchResults.add(Integer.toString(seq.findIndex(res) - 1));
-            searchResults.add(Integer.toString(seq.findIndex(res) - 1));
+            searchResults.add(res+"");
+            searchResults.add(res+"");
         }
         catch (NumberFormatException ex)
         {