Null sequence check

[jalview.git] / src / jalview / gui / Finder.java

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index e5c94bd..ff4fe60 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -181,6 +181,8 @@ public class Finder extends GFinder
         createNewGroup.setEnabled(false);\r
 \r
         String searchString = textfield.getText().toUpperCase().trim();\r
+        if(searchString.length()<1)\r
+          return;\r
 \r
         com.stevesoft.pat.Regex regex = new com.stevesoft.pat.Regex(searchString);\r
 \r
@@ -260,7 +262,7 @@ public class Finder extends GFinder
             }\r
 \r
             ///Shall we ignore gaps????\r
-            StringBuffer noGaps = new StringBuffer();\r
+            StringBuffer noGapsSB = new StringBuffer();\r
             int insertCount = 0;\r
             Vector spaces = new Vector();\r
 \r
@@ -268,7 +270,7 @@ public class Finder extends GFinder
             {\r
                 if (!jalview.util.Comparison.isGap(item.charAt(j)))\r
                 {\r
-                    noGaps.append(item.charAt(j));\r
+                    noGapsSB.append(item.charAt(j));\r
                     spaces.add(new Integer(insertCount));\r
                 }\r
                 else\r
@@ -277,9 +279,12 @@ public class Finder extends GFinder
                 }\r
             }\r
 \r
+            String noGaps = noGapsSB.toString();\r
+\r
             for (int r = resIndex; r < noGaps.length(); r++)\r
             {\r
-                if (regex.searchFrom(noGaps.toString(), r))\r
+\r
+                if (regex.searchFrom(noGaps, r))\r
                 {\r
                     resIndex = regex.matchedFrom();\r
 \r
@@ -313,6 +318,10 @@ public class Finder extends GFinder
 \r
                     r = resIndex;\r
                 }\r
+                else\r
+                {\r
+                  break;\r
+                }\r
             }\r
 \r
             if (!found)\r