Replace use of deprecated methods

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

Author: Niall Pemberton

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

@@ -693,11 +693,11 @@ public static IOFileFilter magicNumberFileFilter(byte[] magicNumber, long offset
     //-----------------------------------------------------------------------
     /* 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 static IOFileFilter makeCVSAware(IOFileFilter filter) {
         if (filter == null) {
             return cvsFilter;
         } else {
-            return andFileFilter(filter, cvsFilter);
+            return and(filter, cvsFilter);
         }
     }
 
@@ -729,7 +729,7 @@ public static IOFileFilter makeSVNAware(IOFileFilter filter) {
         if (filter == null) {
             return svnFilter;
         } else {
-            return andFileFilter(filter, svnFilter);
+            return and(filter, svnFilter);
         }
     }
 

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

@@ -86,7 +86,7 @@ public void testSuffix() throws Exception {
         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);