IO-120 Improve file filter toString() methods

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

Author: Niall Pemberton

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

@@ -53,4 +53,15 @@ public boolean accept(File dir, String name) {
         return accept(new File(dir, name));
     }
 
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        String name = getClass().getName();
+        int period = name.lastIndexOf('.');
+        return (period > 0 ? name.substring(period + 1) : name);
+    }
+
 }

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

@@ -137,4 +137,13 @@ public boolean accept(File file) {
         return acceptOlder ? !newer : newer;
     }
 
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        String condition = acceptOlder ? "<=" : ">";
+        return super.toString() + "(" + condition + cutoff + ")";
+    }
 }

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

@@ -141,4 +141,26 @@ public boolean accept(final File file, final String name) {
         return true;
     }
 
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(super.toString());
+        buffer.append("(");
+        if (fileFilters != null) {
+            for (int i = 0; i < fileFilters.size(); i++) {
+                if (i > 0) {
+                    buffer.append(",");
+                }
+                Object filter = fileFilters.get(i);
+                buffer.append(filter == null ? "null" : filter.toString());
+            }
+        }
+        buffer.append(")");
+        return buffer.toString();
+    }
+
 }

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

@@ -87,5 +87,15 @@ public boolean accept(File dir, String name) {
             return super.accept(dir, name);
         }
     }
+
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        String delegate = (fileFilter != null ? fileFilter.toString() : filenameFilter.toString()); 
+        return super.toString() + "(" + delegate.toString() + ")";
+    }
 
 }

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

@@ -166,4 +166,25 @@ public boolean accept(File file, String name) {
         return false;
     }
 
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(super.toString());
+        buffer.append("(");
+        if (names != null) {
+            for (int i = 0; i < names.length; i++) {
+                if (i > 0) {
+                    buffer.append(",");
+                }
+                buffer.append(names[i]);
+            }
+        }
+        buffer.append(")");
+        return buffer.toString();
+    }
+
 }

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

@@ -64,5 +64,14 @@ public boolean accept(File file) {
     public boolean accept(File file, String name) {
         return ! filter.accept(file, name);
     }
+
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        return super.toString() + "(" + filter.toString()  + ")";
+    }
 
 }

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

@@ -135,4 +135,26 @@ public boolean accept(final File file, final String name) {
         return false;
     }
 
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(super.toString());
+        buffer.append("(");
+        if (fileFilters != null) {
+            for (int i = 0; i < fileFilters.size(); i++) {
+                if (i > 0) {
+                    buffer.append(",");
+                }
+                Object filter = fileFilters.get(i);
+                buffer.append(filter == null ? "null" : filter.toString());
+            }
+        }
+        buffer.append(")");
+        return buffer.toString();
+    }
+
 }

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

@@ -120,5 +120,26 @@ public boolean accept(File file, String name) {
         }
         return false;
     }
+
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(super.toString());
+        buffer.append("(");
+        if (prefixes != null) {
+            for (int i = 0; i < prefixes.length; i++) {
+                if (i > 0) {
+                    buffer.append(",");
+                }
+                buffer.append(prefixes[i]);
+            }
+        }
+        buffer.append(")");
+        return buffer.toString();
+    }
 
 }

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

@@ -89,4 +89,14 @@ public boolean accept(File file) {
         return acceptLarger ? !smaller : smaller;
     }
 
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        String condition = acceptLarger ? ">=" : "<";
+        return super.toString() + "(" + condition + size + ")";
+    }
+
 }

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

@@ -121,5 +121,26 @@ public boolean accept(File file, String name) {
         }
         return false;
     }
+
+    /**
+     * Provide a String representaion of this file filter.
+     *
+     * @return a String representaion
+     */
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(super.toString());
+        buffer.append("(");
+        if (suffixes != null) {
+            for (int i = 0; i < suffixes.length; i++) {
+                if (i > 0) {
+                    buffer.append(",");
+                }
+                buffer.append(suffixes[i]);
+            }
+        }
+        buffer.append(")");
+        return buffer.toString();
+    }
 
 }