merge from 2_4_Release branch

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

diff --git a/src/com/stevesoft/pat/Any.java b/src/com/stevesoft/pat/Any.java
index e833662..c97599c 100755 (executable)
--- a/src/com/stevesoft/pat/Any.java
+++ b/src/com/stevesoft/pat/Any.java
@@ -1,55 +1,55 @@
-//\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 is the '.' character in a Pattern.  It\r
- matches any character. */\r
-class Any\r
-    extends Pattern\r
-{\r
-  public int matchInternal(int pos, Pthings pt)\r
-  {\r
-    if (pos < pt.src.length())\r
-    {\r
-      if (pt.dotDoesntMatchCR)\r
-      {\r
-        if (pt.src.charAt(pos) != '\n')\r
-        {\r
-          return nextMatch(pos + 1, pt);\r
-        }\r
-      }\r
-      else\r
-      {\r
-        return nextMatch(pos + 1, pt);\r
-      }\r
-    }\r
-    return -1;\r
-  }\r
-\r
-  public String toString()\r
-  {\r
-    return "." + nextString();\r
-  }\r
-\r
-  public patInt minChars()\r
-  {\r
-    return new patInt(1);\r
-  }\r
-\r
-  public patInt maxChars()\r
-  {\r
-    return new patInt(1);\r
-  }\r
-\r
-  public Pattern clone1(Hashtable h)\r
-  {\r
-    return new Any();\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 is the '.' character in a Pattern. It matches any character.
+ */
+class Any extends Pattern
+{
+  public int matchInternal(int pos, Pthings pt)
+  {
+    if (pos < pt.src.length())
+    {
+      if (pt.dotDoesntMatchCR)
+      {
+        if (pt.src.charAt(pos) != '\n')
+        {
+          return nextMatch(pos + 1, pt);
+        }
+      }
+      else
+      {
+        return nextMatch(pos + 1, pt);
+      }
+    }
+    return -1;
+  }
+
+  public String toString()
+  {
+    return "." + nextString();
+  }
+
+  public patInt minChars()
+  {
+    return new patInt(1);
+  }
+
+  public patInt maxChars()
+  {
+    return new patInt(1);
+  }
+
+  public Pattern clone1(Hashtable h)
+  {
+    return new Any();
+  }
+};