merge from 2_4_Release branch

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

diff --git a/src/com/stevesoft/pat/DirFileRegex.java b/src/com/stevesoft/pat/DirFileRegex.java
index 24c0cf6..bc62910 100755 (executable)
--- a/src/com/stevesoft/pat/DirFileRegex.java
+++ b/src/com/stevesoft/pat/DirFileRegex.java
@@ -1,30 +1,31 @@
-//\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
-/** This class is just like FileRegex, except that its accept method\r
- only returns true if the file matching the pattern is a directory.*/\r
-public class DirFileRegex\r
-    extends FileRegex\r
-{\r
-  public DirFileRegex()\r
-  {\r
-    dirflag = DIR;\r
-  }\r
-\r
-  public DirFileRegex(String fp)\r
-  {\r
-    super(fp);\r
-    dirflag = DIR;\r
-  }\r
-\r
-  public static String[] list(String f)\r
-  {\r
-    return list(f, DIR);\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;
+
+/**
+ * This class is just like FileRegex, except that its accept method only returns
+ * true if the file matching the pattern is a directory.
+ */
+public class DirFileRegex extends FileRegex
+{
+  public DirFileRegex()
+  {
+    dirflag = DIR;
+  }
+
+  public DirFileRegex(String fp)
+  {
+    super(fp);
+    dirflag = DIR;
+  }
+
+  public static String[] list(String f)
+  {
+    return list(f, DIR);
+  }
+}