X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fcom%2Fstevesoft%2Fpat%2FRegOpt.java;fp=src%2Fcom%2Fstevesoft%2Fpat%2FRegOpt.java;h=bb1b115d8a6cc53d09f2c6542f2f274e7dc1cee5;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=d5f62dec406614fa914b4325179d09ddc4268ab6;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git diff --git a/src/com/stevesoft/pat/RegOpt.java b/src/com/stevesoft/pat/RegOpt.java index d5f62de..bb1b115 100755 --- a/src/com/stevesoft/pat/RegOpt.java +++ b/src/com/stevesoft/pat/RegOpt.java @@ -21,8 +21,9 @@ class FastChar extends oneChar public int matchInternal(int p, Pthings pt) { - return (p < pt.src.length() && pt.src.charAt(p) == c) ? nextMatch( - p + 1, pt) : -1; + return (p < pt.src.length() && pt.src.charAt(p) == c) + ? nextMatch(p + 1, pt) + : -1; } Pattern clone1(Hashtable h) @@ -317,9 +318,8 @@ public class RegOpt Pattern pp = (Pattern) v.elementAt(i); // We want to have at least two oneChar's in // the Or Object to consider making a Branch. - if (pp instanceof oneChar - && (b.h.size() >= 1 || (i + 1 < v.size() && v - .elementAt(i + 1) instanceof oneChar))) + if (pp instanceof oneChar && (b.h.size() >= 1 || (i + 1 < v.size() + && v.elementAt(i + 1) instanceof oneChar))) { b.addc((oneChar) pp, ignoreCase, dontMinQ); }