svn commit: r1003661 - in /commons/proper/io/trunk/src: java/org/apache/commons/io/filefilter/FileFilterUtils.java test/org/apache/commons/io/filefilter/FileFilterTestCase.java

[niallp]

Author: niallp
Date: Fri Oct  1 21:49:53 2010
New Revision: 1003661

URL: http://svn.apache.org/viewvc?rev=1003661&view=rev
Log:
Replace use of deprecated methods

Modified:
    
commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/FileFilterUtils.java
    
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

Modified: 
commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/FileFilterUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/FileFilterUtils.java?rev=1003661&r1=1003660&r2=1003661&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/FileFilterUtils.java
 (original)
+++ 
commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/FileFilterUtils.java
 Fri Oct  1 21:49:53 2010
@@ -693,11 +693,11 @@ public class FileFilterUtils {
     //-----------------------------------------------------------------------
     /* Constructed on demand and then cached */
     private static final IOFileFilter cvsFilter = notFileFilter(
-            andFileFilter(directoryFileFilter(), nameFileFilter("CVS")));;
+            and(directoryFileFilter(), nameFileFilter("CVS")));;
 
     /* Constructed on demand and then cached */
     private static final IOFileFilter svnFilter = notFileFilter(
-            andFileFilter(directoryFileFilter(), nameFileFilter(".svn")));
+            and(directoryFileFilter(), nameFileFilter(".svn")));
 
     /**
      * Decorates a filter to make it ignore CVS directories.
@@ -712,7 +712,7 @@ public class FileFilterUtils {
         if (filter == null) {
             return cvsFilter;
         } else {
-            return andFileFilter(filter, cvsFilter);
+            return and(filter, cvsFilter);
         }
     }
 
@@ -729,7 +729,7 @@ public class FileFilterUtils {
         if (filter == null) {
             return svnFilter;
         } else {
-            return andFileFilter(filter, svnFilter);
+            return and(filter, svnFilter);
         }
     }
 

Modified: 
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java?rev=1003661&r1=1003660&r2=1003661&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java
 (original)
+++ 
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java
 Fri Oct  1 21:49:53 2010
@@ -86,7 +86,7 @@ public class FileFilterTestCase extends 
         assertFiltering(filter, new File("fred.EST"), false); //case-sensitive
         assertFiltering(filter, new File("fred.exe"), false);
 
-        filter = FileFilterUtils.orFileFilter( 
+        filter = FileFilterUtils.or( 
                     FileFilterUtils.suffixFileFilter( "tes" ),
                     FileFilterUtils.suffixFileFilter( "est" ) );
         assertFiltering(filter, new File("fred"), false);