merge from 2_4_Release branch

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

diff --git a/src/com/stevesoft/pat/SubMark.java b/src/com/stevesoft/pat/SubMark.java
index ab5e431..245fa6c 100755 (executable)
--- a/src/com/stevesoft/pat/SubMark.java
+++ b/src/com/stevesoft/pat/SubMark.java
@@ -1,22 +1,32 @@
-//\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
-/** OrMark and SubMark together implement ( ... ) */\r
-class SubMark extends Pattern {\r
-    int end_pos,start_pos;\r
-    OrMark om;\r
-    public String toString() { return ""; }\r
-    public int matchInternal(int i,Pthings pt) {\r
-        pt.marks[om.id+pt.nMarks] = i;\r
-        int ret=nextMatch(i,pt);\r
-        if(ret < 0)\r
-            pt.marks[om.id+pt.nMarks] = -1;\r
-        return ret;\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;
+
+/** OrMark and SubMark together implement ( ... ) */
+class SubMark extends Pattern
+{
+  int end_pos, start_pos;
+
+  OrMark om;
+
+  public String toString()
+  {
+    return "";
+  }
+
+  public int matchInternal(int i, Pthings pt)
+  {
+    pt.marks[om.id + pt.nMarks] = i;
+    int ret = nextMatch(i, pt);
+    if (ret < 0)
+    {
+      pt.marks[om.id + pt.nMarks] = -1;
+    }
+    return ret;
+  }
+}