X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FFinder.java;h=3562deeaa23979c9f40f677d81ecc816a6eef089;hp=3c72598179d0541eb6d445295361b8349b9b8543;hb=refs%2Fheads%2Fj2s%2Fdevelop-bh;hpb=c07eb2c5794833bd0241000d6844d783fe10cb82 diff --git a/src/jalview/analysis/Finder.java b/src/jalview/analysis/Finder.java index 3c72598..3562dee 100644 --- 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; }