Changeset 3837

Timestamp:

Oct 15, 2007, 7:43:36 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

No longer implement the FilenameFilter? interface since it couldn't be implemented
correctly.

File:

• trunk/src/core/net/sf/basedb/util/RegexpFileFilter.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/RegexpFileFilter.java

@@ -26 +26 @@
 import java.io.File;
 import java.io.FileFilter;
-import java.io.FilenameFilter;
 import java.util.regex.Pattern;
 
 /**
-  An implementation of the {@link FilenameFilter} and {@link FileFilter} 
-  that filter files and directories based on a regular expression.
+  An implementation of the {@link FileFilter} interface
+  that filter files and directories based on regular expressions.
 
   @author nicklas
@@ -38 +37 @@
 */
 public class RegexpFileFilter
-  implements FilenameFilter, FileFilter
+  implements FileFilter
 {
 
@@ -73 +72 @@
     Accept files with a name matching the regular expression
   */
-  public boolean accept(File dir, String name)
-  {
-    if (name == null && dir == null)
-    {
-      return directoryPattern == null && filePattern == null;
-    }
-    else if (name == null)
-    {
-      return directoryPattern == null || directoryPattern.matcher(dir.getName()).matches();
-    }
-    else
-    {
-      return filePattern == null || filePattern.matcher(name).matches();
-    }
-  }
-  
-  /**
-    Accept files with a name matching the regular expression
-  */
   public boolean accept(File file)
   {