Sort members.

Author: Gary Gregory

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

@@ -51,34 +51,11 @@ public class AgeFileFilter extends AbstractFileFilter implements Serializable {
 
     private static final long serialVersionUID = -2132740084016138541L;
 
-    /** The cutoff time threshold. */
-    private final long cutoff;
-
     /** Whether the files accepted will be older or newer. */
     private final boolean acceptOlder;
 
-    /**
-     * Constructs a new age file filter for files equal to or older than
-     * a certain cutoff
-     *
-     * @param cutoff  the threshold age of the files
-     */
-    public AgeFileFilter(final long cutoff) {
-        this(cutoff, true);
-    }
-
-    /**
-     * Constructs a new age file filter for files on any one side
-     * of a certain cutoff.
-     *
-     * @param cutoff  the threshold age of the files
-     * @param acceptOlder  if true, older files (at or before the cutoff)
-     * are accepted, else newer ones (after the cutoff).
-     */
-    public AgeFileFilter(final long cutoff, final boolean acceptOlder) {
-        this.acceptOlder = acceptOlder;
-        this.cutoff = cutoff;
-    }
+    /** The cutoff time threshold. */
+    private final long cutoff;
 
     /**
      * Constructs a new age file filter for files older than (at or before)
@@ -127,6 +104,29 @@ public AgeFileFilter(final File cutoffReference, final boolean acceptOlder) {
         this(cutoffReference.lastModified(), acceptOlder);
     }
 
+    /**
+     * Constructs a new age file filter for files equal to or older than
+     * a certain cutoff
+     *
+     * @param cutoff  the threshold age of the files
+     */
+    public AgeFileFilter(final long cutoff) {
+        this(cutoff, true);
+    }
+
+    /**
+     * Constructs a new age file filter for files on any one side
+     * of a certain cutoff.
+     *
+     * @param cutoff  the threshold age of the files
+     * @param acceptOlder  if true, older files (at or before the cutoff)
+     * are accepted, else newer ones (after the cutoff).
+     */
+    public AgeFileFilter(final long cutoff, final boolean acceptOlder) {
+        this.acceptOlder = acceptOlder;
+        this.cutoff = cutoff;
+    }
+
     //-----------------------------------------------------------------------
     /**
      * Checks to see if the last modification of the file matches cutoff

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

@@ -52,6 +52,22 @@ public AndFileFilter() {
         this.fileFilters = new ArrayList<>();
     }
 
+    /**
+     * Constructs a new file filter that ANDs 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(final IOFileFilter filter1, final IOFileFilter filter2) {
+        if (filter1 == null || filter2 == null) {
+            throw new IllegalArgumentException("The filters must not be null");
+        }
+        this.fileFilters = new ArrayList<>(2);
+        addFileFilter(filter1);
+        addFileFilter(filter2);
+    }
+
     /**
      * Constructs a new instance of <code>AndFileFilter</code>
      * with the specified list of filters.
@@ -68,19 +84,35 @@ public AndFileFilter(final List<IOFileFilter> fileFilters) {
     }
 
     /**
-     * Constructs a new file filter that ANDs 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
+     * {@inheritDoc}
      */
-    public AndFileFilter(final IOFileFilter filter1, final IOFileFilter filter2) {
-        if (filter1 == null || filter2 == null) {
-            throw new IllegalArgumentException("The filters must not be null");
+    @Override
+    public boolean accept(final File file) {
+        if (this.fileFilters.isEmpty()) {
+            return false;
         }
-        this.fileFilters = new ArrayList<>(2);
-        addFileFilter(filter1);
-        addFileFilter(filter2);
+        for (final IOFileFilter fileFilter : fileFilters) {
+            if (!fileFilter.accept(file)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean accept(final File file, final String name) {
+        if (this.fileFilters.isEmpty()) {
+            return false;
+        }
+        for (final IOFileFilter fileFilter : fileFilters) {
+            if (!fileFilter.accept(file, name)) {
+                return false;
+            }
+        }
+        return true;
     }
 
     /**
@@ -116,38 +148,6 @@ public void setFileFilters(final List<IOFileFilter> fileFilters) {
         this.fileFilters.addAll(fileFilters);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean accept(final File file) {
-        if (this.fileFilters.isEmpty()) {
-            return false;
-        }
-        for (final IOFileFilter fileFilter : fileFilters) {
-            if (!fileFilter.accept(file)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean accept(final File file, final String name) {
-        if (this.fileFilters.isEmpty()) {
-            return false;
-        }
-        for (final IOFileFilter fileFilter : fileFilters) {
-            if (!fileFilter.accept(file, name)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     /**
      * Provide a String representation of this file filter.
      *

src/main/java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java

@@ -50,14 +50,14 @@
  */
 public class CanExecuteFileFilter extends AbstractFileFilter implements Serializable {
 
-    private static final long serialVersionUID = 3179904805251622989L;
-
     /** Singleton instance of <i>executable</i> filter */
     public static final IOFileFilter CAN_EXECUTE = new CanExecuteFileFilter();
 
     /** Singleton instance of not <i>executable</i> filter */
     public static final IOFileFilter CANNOT_EXECUTE = new NotFileFilter(CAN_EXECUTE);
 
+    private static final long serialVersionUID = 3179904805251622989L;
+
     /**
      * Restrictive constructor.
      */

src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java

@@ -62,8 +62,6 @@
  */
 public class CanReadFileFilter extends AbstractFileFilter implements Serializable {
 
-    private static final long serialVersionUID = 3179904805251622989L;
-
     /** Singleton instance of <i>readable</i> filter */
     public static final IOFileFilter CAN_READ = new CanReadFileFilter();
 
@@ -74,6 +72,8 @@ public class CanReadFileFilter extends AbstractFileFilter implements Serializabl
     public static final IOFileFilter READ_ONLY = new AndFileFilter(CAN_READ,
                                                 CanWriteFileFilter.CANNOT_WRITE);
 
+    private static final long serialVersionUID = 3179904805251622989L;
+
     /**
      * Restrictive constructor.
      */

src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java

@@ -54,14 +54,14 @@
  */
 public class CanWriteFileFilter extends AbstractFileFilter implements Serializable {
 
-    private static final long serialVersionUID = 5132005214688990379L;
-
     /** Singleton instance of <i>writable</i> filter */
     public static final IOFileFilter CAN_WRITE = new CanWriteFileFilter();
 
     /** Singleton instance of not <i>writable</i> filter */
     public static final IOFileFilter CANNOT_WRITE = new NotFileFilter(CAN_WRITE);
 
+    private static final long serialVersionUID = 5132005214688990379L;
+
     /**
      * Restrictive constructor.
      */

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

@@ -33,35 +33,35 @@
 public class DelegateFileFilter extends AbstractFileFilter implements Serializable {
 
     private static final long serialVersionUID = -8723373124984771318L;
-    /** The Filename filter */
-    private final FilenameFilter filenameFilter;
     /** The File filter */
     private final FileFilter fileFilter;
+    /** The Filename filter */
+    private final FilenameFilter filenameFilter;
 
     /**
-     * Constructs a delegate file filter around an existing FilenameFilter.
+     * Constructs a delegate file filter around an existing FileFilter.
      *
      * @param filter  the filter to decorate
      */
-    public DelegateFileFilter(final FilenameFilter filter) {
+    public DelegateFileFilter(final FileFilter filter) {
         if (filter == null) {
-            throw new IllegalArgumentException("The FilenameFilter must not be null");
+            throw new IllegalArgumentException("The FileFilter must not be null");
         }
-        this.filenameFilter = filter;
-        this.fileFilter = null;
+        this.fileFilter = filter;
+        this.filenameFilter = null;
     }
 
     /**
-     * Constructs a delegate file filter around an existing FileFilter.
+     * Constructs a delegate file filter around an existing FilenameFilter.
      *
      * @param filter  the filter to decorate
      */
-    public DelegateFileFilter(final FileFilter filter) {
+    public DelegateFileFilter(final FilenameFilter filter) {
         if (filter == null) {
-            throw new IllegalArgumentException("The FileFilter must not be null");
+            throw new IllegalArgumentException("The FilenameFilter must not be null");
         }
-        this.fileFilter = filter;
-        this.filenameFilter = null;
+        this.filenameFilter = filter;
+        this.fileFilter = null;
     }
 
     /**

src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java

@@ -40,7 +40,6 @@
  */
 public class DirectoryFileFilter extends AbstractFileFilter implements Serializable {
 
-    private static final long serialVersionUID = -5148237843784525732L;
     /**
      * Singleton instance of directory filter.
      * @since 1.3
@@ -53,6 +52,7 @@ public class DirectoryFileFilter extends AbstractFileFilter implements Serializa
      * values when using static imports.
      */
     public static final IOFileFilter INSTANCE = DIRECTORY;
+    private static final long serialVersionUID = -5148237843784525732L;
 
     /**
      * Restrictive constructor.

src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java

@@ -53,14 +53,14 @@
  */
 public class EmptyFileFilter extends AbstractFileFilter implements Serializable {
 
-    private static final long serialVersionUID = 3631422087512832211L;
-
     /** Singleton instance of <i>empty</i> filter */
     public static final IOFileFilter EMPTY = new EmptyFileFilter();
 
     /** Singleton instance of <i>not-empty</i> filter */
     public static final IOFileFilter NOT_EMPTY = new NotFileFilter(EMPTY);
 
+    private static final long serialVersionUID = 3631422087512832211L;
+
     /**
      * Restrictive constructor.
      */

src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java

@@ -29,7 +29,6 @@
  */
 public class FalseFileFilter implements IOFileFilter, Serializable {
 
-    private static final long serialVersionUID = 6210271677940926200L;
     /**
      * Singleton instance of false filter.
      * @since 1.3
@@ -42,6 +41,7 @@ public class FalseFileFilter implements IOFileFilter, Serializable {
      * values when using static imports.
      */
     public static final IOFileFilter INSTANCE = FALSE;
+    private static final long serialVersionUID = 6210271677940926200L;
 
     /**
      * Restrictive constructor.

src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java

@@ -39,9 +39,9 @@
  */
 public class FileFileFilter extends AbstractFileFilter implements Serializable {
 
-    private static final long serialVersionUID = 5345244090827540862L;
     /** Singleton instance of file filter */
     public static final IOFileFilter FILE = new FileFileFilter();
+    private static final long serialVersionUID = 5345244090827540862L;
 
     /**
      * Restrictive constructor.