merge from 2_4_Release branch

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

diff --git a/src/com/stevesoft/pat/BackMatch.java b/src/com/stevesoft/pat/BackMatch.java
index 2eed23b..1b166e9 100755 (executable)
--- a/src/com/stevesoft/pat/BackMatch.java
+++ b/src/com/stevesoft/pat/BackMatch.java
@@ -1,57 +1,57 @@
-//\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
-/** Provides the ability to match a backreference from within\r
- * a Pattern.\r
- */\r
-class BackMatch\r
-    extends Pattern\r
-{\r
-  int id;\r
-  BackMatch(int id)\r
-  {\r
-    this.id = id;\r
-  }\r
-\r
-  public String toString()\r
-  {\r
-    return "\\" + (id) + nextString();\r
-  }\r
-\r
-  public int matchInternal(int pos, Pthings p)\r
-  {\r
-    int i1 = p.marks[id];\r
-    int i2 = p.marks[id + p.nMarks];\r
-    int imax = i2 - i1;\r
-    if (i1 < 0 || imax < 0 || pos + imax > p.src.length())\r
-    {\r
-      return -1;\r
-    }\r
-    int ns = p.src.length() - pos;\r
-    if (imax < ns)\r
-    {\r
-      ns = imax;\r
-    }\r
-    for (int i = 0; i < ns; i++)\r
-    {\r
-      if (p.src.charAt(i + i1) != p.src.charAt(pos + i))\r
-      {\r
-        return -1;\r
-      }\r
-    }\r
-    return nextMatch(pos + imax, p);\r
-  }\r
-\r
-  Pattern clone1(Hashtable h)\r
-  {\r
-    return new BackMatch(id);\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.*;
+
+/**
+ * Provides the ability to match a backreference from within a Pattern.
+ */
+class BackMatch extends Pattern
+{
+  int id;
+
+  BackMatch(int id)
+  {
+    this.id = id;
+  }
+
+  public String toString()
+  {
+    return "\\" + (id) + nextString();
+  }
+
+  public int matchInternal(int pos, Pthings p)
+  {
+    int i1 = p.marks[id];
+    int i2 = p.marks[id + p.nMarks];
+    int imax = i2 - i1;
+    if (i1 < 0 || imax < 0 || pos + imax > p.src.length())
+    {
+      return -1;
+    }
+    int ns = p.src.length() - pos;
+    if (imax < ns)
+    {
+      ns = imax;
+    }
+    for (int i = 0; i < ns; i++)
+    {
+      if (p.src.charAt(i + i1) != p.src.charAt(pos + i))
+      {
+        return -1;
+      }
+    }
+    return nextMatch(pos + imax, p);
+  }
+
+  Pattern clone1(Hashtable h)
+  {
+    return new BackMatch(id);
+  }
+}