Formatting

[jalview.git] / src / com / stevesoft / pat / Range.java

diff --git a/src/com/stevesoft/pat/Range.java b/src/com/stevesoft/pat/Range.java
index 5d5f9a1..5b740cd 100755 (executable)
--- a/src/com/stevesoft/pat/Range.java
+++ b/src/com/stevesoft/pat/Range.java
@@ -6,56 +6,93 @@
 //    -- Happy Computing!\r
 //\r
 package com.stevesoft.pat;\r
-import java.util.Hashtable;\r
+\r
+import java.util.*;\r
 \r
 /** Thrown when one encounters things like [z-a] */\r
-class BadRangeArgs extends RegSyntax {};\r
+class BadRangeArgs\r
+    extends RegSyntax\r
+{};\r
 \r
 /** Implments a subelement (ranges) of the [] pattern element.\r
-For example, [a-z023] is implemented using a range and tree oneChar\r
-classes.\r
-@see Bracket\r
-@see oneChar\r
-*/\r
-class Range extends Pattern {\r
-    char lo,hi,altlo,althi;\r
-    boolean printBrackets = false;\r
-    public String toString() {\r
-        String s=protect(""+lo,PROTECT_THESE,ESC)+"-"\r
-            +protect(""+hi,PROTECT_THESE,ESC);\r
-        if(!printBrackets)\r
-            return s;\r
-        return "["+s+"]";\r
+ For example, [a-z023] is implemented using a range and tree oneChar\r
+ classes.\r
+ @see Bracket\r
+ @see oneChar\r
+ */\r
+class Range\r
+    extends Pattern\r
+{\r
+  char lo, hi, altlo, althi;\r
+  boolean printBrackets = false;\r
+  public String toString()\r
+  {\r
+    String s = protect("" + lo, PROTECT_THESE, ESC) + "-"\r
+        + protect("" + hi, PROTECT_THESE, ESC);\r
+    if (!printBrackets)\r
+    {\r
+      return s;\r
+    }\r
+    return "[" + s + "]";\r
+  }\r
+\r
+  Range(char loi, char hii)\r
+      throws RegSyntax\r
+  {\r
+    lo = loi;\r
+    hi = hii;\r
+    oneChar o = null;\r
+    if (lo >= hi)\r
+    {\r
+      //throw new BadRangeArgs();\r
+      RegSyntaxError.endItAll("Badly formed []'s : " + lo + " >= " + hi);\r
+    }\r
+    o = new oneChar(lo);\r
+    altlo = o.altc;\r
+    o = new oneChar(hi);\r
+    althi = o.altc;\r
+  }\r
+\r
+  public int matchInternal(int pos, Pthings pt)\r
+  {\r
+    if (pos >= pt.src.length())\r
+    {\r
+      return -1;\r
     }\r
-    Range(char loi,char hii) throws RegSyntax {\r
-        lo = loi; hi = hii;\r
-        oneChar o = null;\r
-        if(lo >= hi)\r
-            //throw new BadRangeArgs();\r
-            RegSyntaxError.endItAll("Badly formed []'s : "+lo+" >= "+hi);\r
-        o = new oneChar(lo);\r
-        altlo = o.altc;\r
-        o = new oneChar(hi);\r
-        althi = o.altc;\r
+    if (Masked(pos, pt))\r
+    {\r
+      return -1;\r
     }\r
-    public int matchInternal(int pos,Pthings pt) {\r
-        if(pos >= pt.src.length()) return -1;\r
-        if(Masked(pos,pt)) return -1;\r
-        char c = pt.src.charAt(pos);\r
-        if(lo <= c && c <= hi ||\r
-                (pt.ignoreCase && (altlo <= c && c <= althi)))\r
-            return nextMatch(pos+1,pt);\r
-        return -1;\r
+    char c = pt.src.charAt(pos);\r
+    if (lo <= c && c <= hi ||\r
+        (pt.ignoreCase && (altlo <= c && c <= althi)))\r
+    {\r
+      return nextMatch(pos + 1, pt);\r
+    }\r
+    return -1;\r
+  }\r
+\r
+  public patInt minChars()\r
+  {\r
+    return new patInt(1);\r
+  }\r
+\r
+  public patInt maxChars()\r
+  {\r
+    return new patInt(1);\r
+  }\r
+\r
+  public Pattern clone1(Hashtable h)\r
+  {\r
+    try\r
+    {\r
+      Range r = new Range(lo, hi);\r
+      r.printBrackets = printBrackets;\r
+      return r;\r
     }\r
-    public patInt minChars() { return new patInt(1); }\r
-    public patInt maxChars() { return new patInt(1); }\r
-    public Pattern clone1(Hashtable h) {\r
-        try {\r
-            Range r = new Range(lo,hi);\r
-            r.printBrackets = printBrackets;\r
-            return r;\r
-        } catch(RegSyntax rs) {\r
-            return null;\r
-        }\r
+    catch (RegSyntax rs)\r
+    {\r
+      return null;\r
     }\r
+  }\r
 };\r