merge from 2_4_Release branch

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

diff --git a/src/com/stevesoft/pat/CustomEndpoint.java b/src/com/stevesoft/pat/CustomEndpoint.java
index ac6c4ba..9608f7e 100755 (executable)
--- a/src/com/stevesoft/pat/CustomEndpoint.java
+++ b/src/com/stevesoft/pat/CustomEndpoint.java
@@ -1,43 +1,44 @@
-//\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
-/** This class is needed internally to make backtracking work\r
- * correctly in user-defined patterns.\r
- */\r
-class CustomEndpoint\r
-    extends Pattern\r
-{\r
-  Custom c;\r
-  CustomEndpoint(Custom cm)\r
-  {\r
-    c = cm;\r
-  }\r
-\r
-  public int matchInternal(int pos, Pthings pt)\r
-  {\r
-    int npos = c.v.validate(pt.src, c.start, pos);\r
-    if (npos >= 0)\r
-    {\r
-      return nextMatch(npos, pt);\r
-    }\r
-    return -1;\r
-  }\r
-\r
-  public String toString()\r
-  {\r
-    return "";\r
-  }\r
-\r
-  Pattern clone1(Hashtable h)\r
-  {\r
-    return new CustomEndpoint( (Custom) c.clone(h));\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.*;
+
+/**
+ * This class is needed internally to make backtracking work correctly in
+ * user-defined patterns.
+ */
+class CustomEndpoint extends Pattern
+{
+  Custom c;
+
+  CustomEndpoint(Custom cm)
+  {
+    c = cm;
+  }
+
+  public int matchInternal(int pos, Pthings pt)
+  {
+    int npos = c.v.validate(pt.src, c.start, pos);
+    if (npos >= 0)
+    {
+      return nextMatch(npos, pt);
+    }
+    return -1;
+  }
+
+  public String toString()
+  {
+    return "";
+  }
+
+  Pattern clone1(Hashtable h)
+  {
+    return new CustomEndpoint((Custom) c.clone(h));
+  }
+}