Fix for user entering number in search window
authoramwaterhouse <Andrew Waterhouse>
Wed, 3 Aug 2005 15:07:41 +0000 (15:07 +0000)
committeramwaterhouse <Andrew Waterhouse>
Wed, 3 Aug 2005 15:07:41 +0000 (15:07 +0000)
src/jalview/gui/Finder.java

index 5f683cb..e5c94bd 100755 (executable)
@@ -197,19 +197,18 @@ public class Finder extends GFinder
         {\r
             int res = Integer.parseInt(searchString);\r
             found = true;\r
-\r
-            if (av.getSelectionGroup().getSize() > 0)\r
+            if (av.getSelectionGroup() == null || av.getSelectionGroup().getSize() < 1)\r
             {\r
-                seq = (Sequence) (av.getSelectionGroup().getSequenceAt(0));\r
+              seq = (Sequence) av.getAlignment().getSequenceAt(0);\r
             }\r
             else\r
             {\r
-                seq = (Sequence) av.getAlignment().getSequenceAt(0);\r
+              seq = (Sequence) (av.getSelectionGroup().getSequenceAt(0));\r
             }\r
 \r
             searchResults.add(Integer.toString(av.getAlignment().findIndex(seq)));\r
-            searchResults.add(Integer.toString(seq.findIndex(res) - 1));\r
-            searchResults.add(Integer.toString(seq.findIndex(res) - 1));\r
+            searchResults.add(res+"");\r
+            searchResults.add(res+"");\r
         }\r
         catch (NumberFormatException ex)\r
         {\r