X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fcom%2Fstevesoft%2Fpat%2FSkip.java;h=c3e05f81f92d2d429f563c83dc542a22fc212182;hp=d3f3822c69b9d7da8d940397d631aadad5217a34;hb=eb40ed78f348375efcd74b5a683bdc2380b3bd61;hpb=c07eb2c5794833bd0241000d6844d783fe10cb82 diff --git a/src/com/stevesoft/pat/Skip.java b/src/com/stevesoft/pat/Skip.java index d3f3822..c3e05f8 100755 --- a/src/com/stevesoft/pat/Skip.java +++ b/src/com/stevesoft/pat/Skip.java @@ -20,8 +20,8 @@ public class Skip static int mkmask(int c) { char x = (char) c; - return ~(CaseMgr.toUpperCase(x) | CaseMgr.toLowerCase(x) | CaseMgr - .toTitleCase(x)); + return ~(CaseMgr.toUpperCaseC(x) | CaseMgr.toLowerCaseC(x) | CaseMgr + .toTitleCaseC(x)); } String src; @@ -102,7 +102,7 @@ public class Skip if (0 == (s.charAt(i) & mask)) { // if(m1||s.regionMatches(ign,i,src,0,src.length()) ) - if (m1 || CaseMgr.regionMatches(s, ign, i, src, 0, src.length())) + if (m1 || CaseMgr.regionMatchesLike2(s, ign, i, src, 0, src.length())) { return i - offset; } @@ -116,7 +116,7 @@ public class Skip if (c == s.charAt(i)) { // if(m1||s.regionMatches(ign,i,src,0,src.length()) ) - if (m1 || CaseMgr.regionMatches(s, ign, i, src, 0, src.length())) + if (m1 || CaseMgr.regionMatchesLike2(s, ign, i, src, 0, src.length())) { return i - offset; } @@ -126,7 +126,7 @@ public class Skip return -1; } - static Skip findSkip(Regex r) + static Skip findSkipRegex(Regex r) { return findSkip(r.thePattern, r.ignoreCase, !r.dontMatchInQuotes); }