X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fcom%2Fstevesoft%2Fpat%2FRegOpt.java;h=bb1b115d8a6cc53d09f2c6542f2f274e7dc1cee5;hb=1e75445b3e45bb22baebbcd215137df1c1aef34f;hp=0d651390d1d13620fdce66bc42d7cd79ba5086b0;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/com/stevesoft/pat/RegOpt.java b/src/com/stevesoft/pat/RegOpt.java
index 0d65139..bb1b115 100755
--- a/src/com/stevesoft/pat/RegOpt.java
+++ b/src/com/stevesoft/pat/RegOpt.java
@@ -7,7 +7,9 @@
 //
 package com.stevesoft.pat;
 
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 
 /** This class is just like oneChar, but doesn't worry about case. */
 class FastChar extends oneChar
@@ -19,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)
@@ -136,16 +139,16 @@ class Branch extends Pattern
       n = RegOpt.opt(n, ignoreCase, dontMinQ);
     }
     n.setParent(this);
-    set(new Character(o.c), n, ignoreCase, dontMinQ);
+    set(Character.valueOf(o.c), n, ignoreCase, dontMinQ);
     if (ignoreCase)
     {
       if (o.c != o.altc)
       {
-        set(new Character(o.altc), n, ignoreCase, dontMinQ);
+        set(Character.valueOf(o.altc), n, ignoreCase, dontMinQ);
       }
       if (o.c != o.altc2 && o.altc != o.altc2)
       {
-        set(new Character(o.altc2), n, ignoreCase, dontMinQ);
+        set(Character.valueOf(o.altc2), n, ignoreCase, dontMinQ);
       }
     }
   }
@@ -248,7 +251,7 @@ class Branch extends Pattern
     {
       return -1;
     }
-    Pattern n = (Pattern) h.get(new Character(pt.src.charAt(pos)));
+    Pattern n = (Pattern) h.get(Character.valueOf(pt.src.charAt(pos)));
     if (n == null)
     {
       return -1;
@@ -315,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);
         }