--- AndFileFilter.java	Fri Aug  7 11:13:16 2009
+++ OrFileFilter.java	Fri Aug  7 11:13:03 2009
@@ -23,18 +23,18 @@
 import java.util.List;
 
 /**
- * A {@link java.io.FileFilter} providing conditional AND logic across a list of
- * file filters. This filter returns <code>true</code> if all filters in the
+ * A {@link java.io.FileFilter} providing conditional OR logic across a list of
+ * file filters. This filter returns <code>true</code> if any filters in the
  * list return <code>true</code>. Otherwise, it returns <code>false</code>.
  * Checking of the file filter list stops when the first filter returns
- * <code>false</code>.
+ * <code>true</code>.
  *
  * @since Commons IO 1.0
  * @version $Revision: 490425 $ $Date: 2006-12-26 17:25:43 -0800 (Tue, 26 Dec 2006) $
  *
  * @author Steven Caswell
  */
-public class AndFileFilter
+public class OrFileFilter
         extends AbstractFileFilter
         implements ConditionalFileFilter {
 
@@ -42,22 +42,22 @@
     private List fileFilters;
 
     /**
-     * Constructs a new instance of <code>AndFileFilter</code>.
+     * Constructs a new instance of <code>OrFileFilter</code>.
      *
      * @since Commons IO 1.1
      */
-    public AndFileFilter() {
+    public OrFileFilter() {
         this.fileFilters = new ArrayList();
     }
 
     /**
-     * Constructs a new instance of <code>AndFileFilter</code>
-     * with the specified list of filters.
+     * Constructs a new instance of <code>OrFileFilter</code>
+     * with the specified filters.
      *
-     * @param fileFilters  a List of IOFileFilter instances, copied, null ignored
+     * @param fileFilters  the file filters for this filter, copied, null ignored
      * @since Commons IO 1.1
      */
-    public AndFileFilter(final List fileFilters) {
+    public OrFileFilter(final List fileFilters) {
         if (fileFilters == null) {
             this.fileFilters = new ArrayList();
         } else {
@@ -66,13 +66,13 @@
     }
 
     /**
-     * Constructs a new file filter that ANDs the result of two other filters.
-     *
+     * Constructs a new file filter that ORs the result of two other filters.
+     * 
      * @param filter1  the first filter, must not be null
      * @param filter2  the second filter, must not be null
      * @throws IllegalArgumentException if either filter is null
      */
-    public AndFileFilter(IOFileFilter filter1, IOFileFilter filter2) {
+    public OrFileFilter(IOFileFilter filter1, IOFileFilter filter2) {
         if (filter1 == null || filter2 == null) {
             throw new IllegalArgumentException("The filters must not be null");
         }
@@ -98,7 +98,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean removeFileFilter(final IOFileFilter ioFileFilter) {
+    public boolean removeFileFilter(IOFileFilter ioFileFilter) {
         return this.fileFilters.remove(ioFileFilter);
     }
 
@@ -106,39 +106,33 @@
      * {@inheritDoc}
      */
     public void setFileFilters(final List fileFilters) {
-        this.fileFilters = new ArrayList(fileFilters);
+        this.fileFilters = fileFilters;
     }
 
     /**
      * {@inheritDoc}
      */
     public boolean accept(final File file) {
-        if (this.fileFilters.size() == 0) {
-            return false;
-        }
         for (Iterator iter = this.fileFilters.iterator(); iter.hasNext();) {
             IOFileFilter fileFilter = (IOFileFilter) iter.next();
-            if (!fileFilter.accept(file)) {
-                return false;
+            if (fileFilter.accept(file)) {
+                return true;
             }
         }
-        return true;
+        return false;
     }
 
     /**
      * {@inheritDoc}
      */
     public boolean accept(final File file, final String name) {
-        if (this.fileFilters.size() == 0) {
-            return false;
-        }
         for (Iterator iter = this.fileFilters.iterator(); iter.hasNext();) {
             IOFileFilter fileFilter = (IOFileFilter) iter.next();
-            if (!fileFilter.accept(file, name)) {
-                return false;
+            if (fileFilter.accept(file, name)) {
+                return true;
             }
         }
-        return true;
+        return false;
     }
 
 }
