IO-74 Rename RegexFilter to RegexFileFilter to conform to the naming convention of other implementations

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

Author: Niall Pemberton

RELEASE-NOTES.txt

@@ -38,7 +38,7 @@ Enhancements from 1.3.2
 - SuffixFileFilter [IO-126]
   - Add faciltiy to specify case sensitivty on suffix matching
 
-- RegexFilter [IO-74]
+- RegexFileFilter [IO-74]
   - Add new regular expression file filter implementation
 
 - New Closed Input/Output stream implementations [IO-122]

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

@@ -289,7 +289,7 @@ public static IOFileFilter sizeRangeFileFilter(long minSizeInclusive, long maxSi
      * @since Commons IO 1.4
      */
     public static IOFileFilter regex(String pattern) {
-        return new RegexFilter(pattern);
+        return new RegexFileFilter(pattern);
     }
 
     /**
@@ -302,7 +302,7 @@ public static IOFileFilter regex(String pattern) {
      * @since Commons IO 1.4
      */
     public static IOFileFilter regex(String pattern, IOCase caseSensitivity) {
-        return new RegexFilter(pattern, caseSensitivity);
+        return new RegexFileFilter(pattern, caseSensitivity);
     }
 
     /**
@@ -315,7 +315,7 @@ public static IOFileFilter regex(String pattern, IOCase caseSensitivity) {
      * @since Commons IO 1.4
      */
     public static IOFileFilter regex(String pattern, int flags) {
-        return new RegexFilter(pattern, flags);
+        return new RegexFileFilter(pattern, flags);
     }
 
     //-----------------------------------------------------------------------

…e/commons/io/filefilter/RegexFilter.java …mmons/io/filefilter/RegexFileFilter.javasrc/java/org/apache/commons/io/filefilter/RegexFilter.java renamed to src/java/org/apache/commons/io/filefilter/RegexFileFilter.java src/java/org/apache/commons/io/filefilter/RegexFilter.java renamed to src/java/org/apache/commons/io/filefilter/RegexFileFilter.java

@@ -30,7 +30,7 @@
  * e.g.
  * <pre>
  * File dir = new File(".");
- * FileFilter fileFilter = new RegexFilter("^.*[tT]est(-\\d+)?\\.java$");
+ * FileFilter fileFilter = new RegexFileFilter("^.*[tT]est(-\\d+)?\\.java$");
  * File[] files = dir.listFiles(fileFilter);
  * for (int i = 0; i < files.length; i++) {
  *   System.out.println(files[i]);
@@ -41,7 +41,7 @@
  * @version $Revision$
  * @since Commons IO 1.4
  */
-public class RegexFilter extends AbstractFileFilter {
+public class RegexFileFilter extends AbstractFileFilter {
 
     /** The regular expression pattern that will be used to match filenames */
     private Pattern pattern;
@@ -52,7 +52,7 @@ public class RegexFilter extends AbstractFileFilter {
      * @param pattern regular string expression to match
      * @throws IllegalArgumentException if the pattern is null
      */
-    public RegexFilter(String pattern) {
+    public RegexFileFilter(String pattern) {
         if (pattern == null) {
             throw new IllegalArgumentException("Pattern is missing");
         }
@@ -67,7 +67,7 @@ public RegexFilter(String pattern) {
      * @param caseSensitivity  how to handle case sensitivity, null means case-sensitive
      * @throws IllegalArgumentException if the pattern is null
      */
-    public RegexFilter(String pattern, IOCase caseSensitivity) {
+    public RegexFileFilter(String pattern, IOCase caseSensitivity) {
         if (pattern == null) {
             throw new IllegalArgumentException("Pattern is missing");
         }
@@ -85,7 +85,7 @@ public RegexFilter(String pattern, IOCase caseSensitivity) {
      * @param flags pattern flags - e.g. {@link Pattern#CASE_INSENSITIVE}
      * @throws IllegalArgumentException if the pattern is null
      */
-    public RegexFilter(String pattern, int flags) {
+    public RegexFileFilter(String pattern, int flags) {
         if (pattern == null) {
             throw new IllegalArgumentException("Pattern is missing");
         }
@@ -98,7 +98,7 @@ public RegexFilter(String pattern, int flags) {
      * @param pattern regular expression to match
      * @throws IllegalArgumentException if the pattern is null
      */
-    public RegexFilter(Pattern pattern) {
+    public RegexFileFilter(Pattern pattern) {
         if (pattern == null) {
             throw new IllegalArgumentException("Pattern is missing");
         }

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

@@ -833,7 +833,7 @@ public void testRegex() throws Exception {
         assertFiltering(filter, new File("test.java"), true);
         assertFiltering(filter, new File("tEST.java"), false);
 
-        filter = new RegexFilter(Pattern.compile("^test.java$", Pattern.CASE_INSENSITIVE));
+        filter = new RegexFileFilter(Pattern.compile("^test.java$", Pattern.CASE_INSENSITIVE));
         assertFiltering(filter, new File("Test.java"), true);
         assertFiltering(filter, new File("test.java"), true);
         assertFiltering(filter, new File("tEST.java"), true);
@@ -870,7 +870,7 @@ public void testRegex() throws Exception {
         }
 
         try {
-            new RegexFilter((java.util.regex.Pattern)null);
+            new RegexFileFilter((java.util.regex.Pattern)null);
             fail();
         } catch (IllegalArgumentException ex) {
             // expected