JAL-1807 Bob's first commit -- Applet loaded; needs image

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

diff --git a/src/jalview/analysis/Finder.java b/src/jalview/analysis/Finder.java
index 3c72598..3562dee 100644 (file)
--- a/src/jalview/analysis/Finder.java
+++ b/src/jalview/analysis/Finder.java
@@ -24,11 +24,13 @@ import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SearchResults;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceGroup;
+import jalview.jsdev.RegExp;
+import jalview.jsdev.api.RegExpInterface;
 import jalview.util.Comparison;
 
 import java.util.Vector;
 
-import com.stevesoft.pat.Regex;
+//import com.stevesoft.pat.Regex;
 
 public class Finder
 {
@@ -49,7 +51,7 @@ public class Finder
 
   boolean findAll = false;
 
-  Regex regex = null;
+  RegExpInterface regex = null;
 
   /**
    * hold's last-searched position between calles to find(false)
@@ -86,7 +88,7 @@ public class Finder
     {
       searchString = searchString.toUpperCase();
     }
-    regex = new Regex(searchString);
+    regex = RegExp.newRegex(searchString);
     regex.setIgnoreCase(!caseSensitive);
     searchResults = new SearchResults();
     idMatch = new Vector();
@@ -333,7 +335,7 @@ public class Finder
   /**
    * @return the regex
    */
-  public Regex getRegex()
+  public RegExpInterface getRegex()
   {
     return regex;
   }