Added a FileFilterUtils.makeSVNAware() taking the makeCVSAware() as a template.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@201606 13f79535-47bb-0310-9956-ffa450edef68

Author: jmaerki

src/java/org/apache/commons/io/filefilter/FileFilterUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2004 The Apache Software Foundation.
+ * Copyright 2002-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,6 +159,9 @@ public static IOFileFilter asFileFilter(FilenameFilter filter) {
     /* Constructed on demand and then cached */
     private static IOFileFilter cvsFilter;
 
+    /* Constructed on demand and then cached */
+    private static IOFileFilter svnFilter;
+
     /**
      * Returns an IOFileFilter that ignores CVS directories. You may optionally
      * pass in an existing IOFileFilter in which case it is extended to exclude
@@ -180,4 +183,25 @@ public static IOFileFilter makeCVSAware(IOFileFilter filter) {
         }
     }
 
+    /**
+     * Returns an IOFileFilter that ignores SVN directories. You may optionally
+     * pass in an existing IOFileFilter in which case it is extended to exclude
+     * SVN directories.
+     * @param filter IOFileFilter to wrap, null if a new IOFileFilter
+     * should be created
+     * @return the requested (combined) filter
+     * @since 1.1
+     */
+    public static IOFileFilter makeSVNAware(IOFileFilter filter) {
+        if (svnFilter == null) {
+            svnFilter = notFileFilter(
+                andFileFilter(directoryFileFilter(), nameFileFilter(".svn")));
+        }
+        if (filter == null) {
+            return svnFilter;
+        } else {
+            return andFileFilter(filter, svnFilter);
+        }
+    }
+
 }

src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2004 The Apache Software Foundation.
+ * Copyright 2002-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -257,5 +257,32 @@ public void testMakeCVSAware() throws Exception {
         assertFiltering(filter2, file, false);
     }
 
+    public void testMakeSVNAware() throws Exception {
+        IOFileFilter filter1 = FileFilterUtils.makeSVNAware(null);
+        IOFileFilter filter2 = FileFilterUtils.makeSVNAware(FileFilterUtils
+            .nameFileFilter("test-file1.txt"));
+
+        File file = new File(getTestDirectory(), ".svn");
+        file.mkdirs();
+        assertFiltering(filter1, file, false);
+        assertFiltering(filter2, file, false);
+        FileUtils.deleteDirectory(file);
+
+        file = new File(getTestDirectory(), "test-file1.txt");
+        createFile(file, 0);
+        assertFiltering(filter1, file, true);
+        assertFiltering(filter2, file, true);
+
+        file = new File(getTestDirectory(), "test-file2.log");
+        createFile(file, 0);
+        assertFiltering(filter1, file, true);
+        assertFiltering(filter2, file, false);
+
+        file = new File(getTestDirectory(), ".svn");
+        createFile(file, 0);
+        assertFiltering(filter1, file, true);
+        assertFiltering(filter2, file, false);
+    }
+         
 }