svn commit: r1002869 - in /commons/proper/io/trunk/src/java/org/apache/commons/io: DirectoryWalker.java FileUtils.java

[niallp]

Author: niallp
Date: Wed Sep 29 22:11:47 2010
New Revision: 1002869

URL: http://svn.apache.org/viewvc?rev=1002869&view=rev
Log:
IO-229 use new FileFilterUtils.and() and FileFilterUtils.or() varargs methods 

Modified:
    commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java
    commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java

Modified: 
commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java?rev=1002869&r1=1002868&r2=1002869&view=diff
==============================================================================
--- commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java 
(original)
+++ commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java 
Wed Sep 29 22:11:47 2010
@@ -305,7 +305,7 @@ public abstract class DirectoryWalker<T>
             fileFilter = (fileFilter != null ? fileFilter : 
TrueFileFilter.TRUE);
             directoryFilter = 
FileFilterUtils.makeDirectoryOnly(directoryFilter);
             fileFilter = FileFilterUtils.makeFileOnly(fileFilter);
-            this.filter = FileFilterUtils.orFileFilter(directoryFilter, 
fileFilter);
+            this.filter = FileFilterUtils.or(directoryFilter, fileFilter);
         }
         this.depthLimit = depthLimit;
     }

Modified: commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java?rev=1002869&r1=1002868&r2=1002869&view=diff
==============================================================================
--- commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java 
(original)
+++ commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java Wed 
Sep 29 22:11:47 2010
@@ -363,7 +363,7 @@ public class FileUtils {
         }
 
         //Setup effective file filter
-        IOFileFilter effFileFilter = FileFilterUtils.andFileFilter(fileFilter,
+        IOFileFilter effFileFilter = FileFilterUtils.and(fileFilter,
             FileFilterUtils.notFileFilter(DirectoryFileFilter.INSTANCE));
 
         //Setup effective directory filter
@@ -371,14 +371,14 @@ public class FileUtils {
         if (dirFilter == null) {
             effDirFilter = FalseFileFilter.INSTANCE;
         } else {
-            effDirFilter = FileFilterUtils.andFileFilter(dirFilter,
+            effDirFilter = FileFilterUtils.and(dirFilter,
                 DirectoryFileFilter.INSTANCE);
         }
 
         //Find files
         Collection<File> files = new java.util.LinkedList<File>();
         innerListFiles(files, directory,
-            FileFilterUtils.orFileFilter(effFileFilter, effDirFilter));
+            FileFilterUtils.or(effFileFilter, effDirFilter));
         return files;
     }