merge from 2_4_Release branch

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

diff --git a/src/com/stevesoft/pat/Skipped.java b/src/com/stevesoft/pat/Skipped.java
index 9bf2837..551166b 100755 (executable)
--- a/src/com/stevesoft/pat/Skipped.java
+++ b/src/com/stevesoft/pat/Skipped.java
@@ -1,54 +1,56 @@
-//\r
-// This software is now distributed according to\r
-// the Lesser Gnu Public License.  Please see\r
-// http://www.gnu.org/copyleft/lesser.txt for\r
-// the details.\r
-//    -- Happy Computing!\r
-//\r
-package com.stevesoft.pat;\r
-\r
-import java.util.*;\r
-\r
-/** Implements the (?<number) Pattern, where number is\r
- an integer telling us how far to back up in the Pattern.\r
- Not in perl 5. */\r
-class Skipped\r
-    extends Pattern\r
-{\r
-  String s;\r
-  Skipped(String s)\r
-  {\r
-    this.s = s;\r
-  }\r
-\r
-  public String toString()\r
-  {\r
-    return s + nextString();\r
-  }\r
-\r
-  public int matchInternal(int pos, Pthings pt)\r
-  {\r
-    //if(pt.no_check || s.regionMatches(pt.ignoreCase,0,pt.src,pos,s.length()))\r
-    if (pt.no_check ||\r
-        CaseMgr.regionMatches(s, pt.ignoreCase, 0, pt.src, pos, s.length()))\r
-    {\r
-      return nextMatch(pos + s.length(), pt);\r
-    }\r
-    return -1;\r
-  }\r
-\r
-  public patInt minChars()\r
-  {\r
-    return new patInt(s.length());\r
-  }\r
-\r
-  public patInt maxChars()\r
-  {\r
-    return new patInt(s.length());\r
-  }\r
-\r
-  Pattern clone1(Hashtable h)\r
-  {\r
-    return new Skipped(s);\r
-  }\r
-};\r
+//
+// This software is now distributed according to
+// the Lesser Gnu Public License.  Please see
+// http://www.gnu.org/copyleft/lesser.txt for
+// the details.
+//    -- Happy Computing!
+//
+package com.stevesoft.pat;
+
+import java.util.*;
+
+/**
+ * Implements the (?<number) Pattern, where number is an integer telling us
+ * how far to back up in the Pattern. Not in perl 5.
+ */
+class Skipped extends Pattern
+{
+  String s;
+
+  Skipped(String s)
+  {
+    this.s = s;
+  }
+
+  public String toString()
+  {
+    return s + nextString();
+  }
+
+  public int matchInternal(int pos, Pthings pt)
+  {
+    // if(pt.no_check || s.regionMatches(pt.ignoreCase,0,pt.src,pos,s.length()))
+    if (pt.no_check
+            || CaseMgr.regionMatches(s, pt.ignoreCase, 0, pt.src, pos, s
+                    .length()))
+    {
+      return nextMatch(pos + s.length(), pt);
+    }
+    return -1;
+  }
+
+  public patInt minChars()
+  {
+    return new patInt(s.length());
+  }
+
+  public patInt maxChars()
+  {
+    return new patInt(s.length());
+  }
+
+  Pattern clone1(Hashtable h)
+  {
+    return new Skipped(s);
+  }
+};