commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1469102 - in /commons/proper/io/trunk/src: main/java/org/apache/commons/io/comparator/ test/java/org/apache/commons/io/comparator/
Date Wed, 17 Apr 2013 23:32:21 GMT
Author: sebb
Date: Wed Apr 17 23:32:21 2013
New Revision: 1469102

URL: http://svn.apache.org/r1469102
Log:
[IO-343] org.apache.commons.io.comparator Javadoc is inconsistent with real code.
Revert r1378539 as it broke binary compatibility

Modified:
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java
Wed Apr 17 23:32:21 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io.comparator
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.Comparator;
 
 /**
  * Compare two files using the <b>default</b> {@link File#compareTo(File)} method.
@@ -45,11 +46,11 @@ import java.io.Serializable;
  */
 public class DefaultFileComparator extends AbstractFileComparator implements Serializable
{
 
-	/** Singleton default comparator instance */
-    public static final DefaultFileComparator DEFAULT_COMPARATOR = new DefaultFileComparator();
+    /** Singleton default comparator instance */
+    public static final Comparator<File> DEFAULT_COMPARATOR = new DefaultFileComparator();
 
     /** Singleton reverse default comparator instance */
-    public static final ReverseComparator DEFAULT_REVERSE = new ReverseComparator(DEFAULT_COMPARATOR);
+    public static final Comparator<File> DEFAULT_REVERSE = new ReverseComparator(DEFAULT_COMPARATOR);
 
     /**
      * Compare the two files using the {@link File#compareTo(File)} method.

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java
Wed Apr 17 23:32:21 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io.comparator
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.Comparator;
 
 /**
  * Compare two files using the {@link File#isDirectory()} method.
@@ -44,12 +45,11 @@ import java.io.Serializable;
  */
 public class DirectoryFileComparator extends AbstractFileComparator implements Serializable
{
 
-
-	/** Singleton default comparator instance */
-    public static final DirectoryFileComparator DIRECTORY_COMPARATOR = new DirectoryFileComparator();
+    /** Singleton default comparator instance */
+    public static final Comparator<File> DIRECTORY_COMPARATOR = new DirectoryFileComparator();
 
     /** Singleton reverse default comparator instance */
-    public static final ReverseComparator DIRECTORY_REVERSE = new ReverseComparator(DIRECTORY_COMPARATOR);
+    public static final Comparator<File> DIRECTORY_REVERSE = new ReverseComparator(DIRECTORY_COMPARATOR);
 
     /**
      * Compare the two files using the {@link File#isDirectory()} method.

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
Wed Apr 17 23:32:21 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io.comparator
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.Comparator;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOCase;
@@ -53,24 +54,24 @@ import org.apache.commons.io.IOCase;
 public class ExtensionFileComparator extends AbstractFileComparator implements Serializable
{
 
     /** Case-sensitive extension comparator instance (see {@link IOCase#SENSITIVE}) */
-    public static final ExtensionFileComparator EXTENSION_COMPARATOR = new ExtensionFileComparator();
+    public static final Comparator<File> EXTENSION_COMPARATOR = new ExtensionFileComparator();
 
     /** Reverse case-sensitive extension comparator instance (see {@link IOCase#SENSITIVE})
*/
-    public static final ReverseComparator EXTENSION_REVERSE = new ReverseComparator(EXTENSION_COMPARATOR);
+    public static final Comparator<File> EXTENSION_REVERSE = new ReverseComparator(EXTENSION_COMPARATOR);
 
     /** Case-insensitive extension comparator instance (see {@link IOCase#INSENSITIVE}) */
-    public static final ExtensionFileComparator EXTENSION_INSENSITIVE_COMPARATOR
+    public static final Comparator<File> EXTENSION_INSENSITIVE_COMPARATOR
                                                 = new ExtensionFileComparator(IOCase.INSENSITIVE);
 
     /** Reverse case-insensitive extension comparator instance (see {@link IOCase#INSENSITIVE})
*/
-    public static final ReverseComparator EXTENSION_INSENSITIVE_REVERSE
+    public static final Comparator<File> EXTENSION_INSENSITIVE_REVERSE
                                                 = new ReverseComparator(EXTENSION_INSENSITIVE_COMPARATOR);
 
     /** System sensitive extension comparator instance (see {@link IOCase#SYSTEM}) */
-    public static final ExtensionFileComparator EXTENSION_SYSTEM_COMPARATOR = new ExtensionFileComparator(IOCase.SYSTEM);
+    public static final Comparator<File> EXTENSION_SYSTEM_COMPARATOR = new ExtensionFileComparator(IOCase.SYSTEM);
 
     /** Reverse system sensitive path comparator instance (see {@link IOCase#SYSTEM}) */
-    public static final ReverseComparator EXTENSION_SYSTEM_REVERSE = new ReverseComparator(EXTENSION_SYSTEM_COMPARATOR);
+    public static final Comparator<File> EXTENSION_SYSTEM_REVERSE = new ReverseComparator(EXTENSION_SYSTEM_COMPARATOR);
 
     /** Whether the comparison is case sensitive. */
     private final IOCase caseSensitivity;

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
Wed Apr 17 23:32:21 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io.comparator
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.Comparator;
 
 /**
  * Compare the <b>last modified date/time</b> of two files for order 
@@ -47,10 +48,10 @@ import java.io.Serializable;
 public class LastModifiedFileComparator extends AbstractFileComparator implements Serializable
{
 
     /** Last modified comparator instance */
-    public static final LastModifiedFileComparator LASTMODIFIED_COMPARATOR = new LastModifiedFileComparator();
+    public static final Comparator<File> LASTMODIFIED_COMPARATOR = new LastModifiedFileComparator();
 
     /** Reverse last modified comparator instance */
-    public static final ReverseComparator LASTMODIFIED_REVERSE = new ReverseComparator(LASTMODIFIED_COMPARATOR);
+    public static final Comparator<File> LASTMODIFIED_REVERSE = new ReverseComparator(LASTMODIFIED_COMPARATOR);
 
     /**
      * Compare the last the last modified date/time of two files.

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java
Wed Apr 17 23:32:21 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io.comparator
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.Comparator;
 
 import org.apache.commons.io.IOCase;
 
@@ -51,22 +52,22 @@ import org.apache.commons.io.IOCase;
 public class NameFileComparator extends AbstractFileComparator implements Serializable {
 
     /** Case-sensitive name comparator instance (see {@link IOCase#SENSITIVE}) */
-    public static final NameFileComparator NAME_COMPARATOR = new NameFileComparator();
+    public static final Comparator<File> NAME_COMPARATOR = new NameFileComparator();
 
     /** Reverse case-sensitive name comparator instance (see {@link IOCase#SENSITIVE}) */
-    public static final ReverseComparator NAME_REVERSE = new ReverseComparator(NAME_COMPARATOR);
+    public static final Comparator<File> NAME_REVERSE = new ReverseComparator(NAME_COMPARATOR);
 
     /** Case-insensitive name comparator instance (see {@link IOCase#INSENSITIVE}) */
-    public static final NameFileComparator NAME_INSENSITIVE_COMPARATOR = new NameFileComparator(IOCase.INSENSITIVE);
+    public static final Comparator<File> NAME_INSENSITIVE_COMPARATOR = new NameFileComparator(IOCase.INSENSITIVE);
 
     /** Reverse case-insensitive name comparator instance (see {@link IOCase#INSENSITIVE})
*/
-    public static final ReverseComparator NAME_INSENSITIVE_REVERSE = new ReverseComparator(NAME_INSENSITIVE_COMPARATOR);
+    public static final Comparator<File> NAME_INSENSITIVE_REVERSE = new ReverseComparator(NAME_INSENSITIVE_COMPARATOR);
 
     /** System sensitive name comparator instance (see {@link IOCase#SYSTEM}) */
-    public static final NameFileComparator NAME_SYSTEM_COMPARATOR = new NameFileComparator(IOCase.SYSTEM);
+    public static final Comparator<File> NAME_SYSTEM_COMPARATOR = new NameFileComparator(IOCase.SYSTEM);
 
     /** Reverse system sensitive name comparator instance (see {@link IOCase#SYSTEM}) */
-    public static final ReverseComparator NAME_SYSTEM_REVERSE = new ReverseComparator(NAME_SYSTEM_COMPARATOR);
+    public static final Comparator<File> NAME_SYSTEM_REVERSE = new ReverseComparator(NAME_SYSTEM_COMPARATOR);
 
     /** Whether the comparison is case sensitive. */
     private final IOCase caseSensitivity;

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java
Wed Apr 17 23:32:21 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io.comparator
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.Comparator;
 
 import org.apache.commons.io.IOCase;
 
@@ -51,22 +52,22 @@ import org.apache.commons.io.IOCase;
 public class PathFileComparator extends AbstractFileComparator implements Serializable {
 
     /** Case-sensitive path comparator instance (see {@link IOCase#SENSITIVE}) */
-    public static final PathFileComparator PATH_COMPARATOR = new PathFileComparator();
+    public static final Comparator<File> PATH_COMPARATOR = new PathFileComparator();
 
     /** Reverse case-sensitive path comparator instance (see {@link IOCase#SENSITIVE}) */
-    public static final ReverseComparator PATH_REVERSE = new ReverseComparator(PATH_COMPARATOR);
+    public static final Comparator<File> PATH_REVERSE = new ReverseComparator(PATH_COMPARATOR);
 
     /** Case-insensitive path comparator instance (see {@link IOCase#INSENSITIVE}) */
-    public static final PathFileComparator PATH_INSENSITIVE_COMPARATOR = new PathFileComparator(IOCase.INSENSITIVE);
+    public static final Comparator<File> PATH_INSENSITIVE_COMPARATOR = new PathFileComparator(IOCase.INSENSITIVE);
 
     /** Reverse case-insensitive path comparator instance (see {@link IOCase#INSENSITIVE})
*/
-    public static final ReverseComparator PATH_INSENSITIVE_REVERSE = new ReverseComparator(PATH_INSENSITIVE_COMPARATOR);
+    public static final Comparator<File> PATH_INSENSITIVE_REVERSE = new ReverseComparator(PATH_INSENSITIVE_COMPARATOR);
 
     /** System sensitive path comparator instance (see {@link IOCase#SYSTEM}) */
-    public static final PathFileComparator PATH_SYSTEM_COMPARATOR = new PathFileComparator(IOCase.SYSTEM);
+    public static final Comparator<File> PATH_SYSTEM_COMPARATOR = new PathFileComparator(IOCase.SYSTEM);
 
     /** Reverse system sensitive path comparator instance (see {@link IOCase#SYSTEM}) */
-    public static final ReverseComparator PATH_SYSTEM_REVERSE = new ReverseComparator(PATH_SYSTEM_COMPARATOR);
+    public static final Comparator<File> PATH_SYSTEM_REVERSE = new ReverseComparator(PATH_SYSTEM_COMPARATOR);
 
     /** Whether the comparison is case sensitive. */
     private final IOCase caseSensitivity;

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
Wed Apr 17 23:32:21 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io.comparator
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.Comparator;
 
 import org.apache.commons.io.FileUtils;
 
@@ -51,22 +52,22 @@ import org.apache.commons.io.FileUtils;
 public class SizeFileComparator extends AbstractFileComparator implements Serializable {
 
     /** Size comparator instance - directories are treated as zero size */
-    public static final SizeFileComparator SIZE_COMPARATOR = new SizeFileComparator();
+    public static final Comparator<File> SIZE_COMPARATOR = new SizeFileComparator();
 
     /** Reverse size comparator instance - directories are treated as zero size */
-    public static final ReverseComparator SIZE_REVERSE = new ReverseComparator(SIZE_COMPARATOR);
+    public static final Comparator<File> SIZE_REVERSE = new ReverseComparator(SIZE_COMPARATOR);
 
     /**
      * Size comparator instance which sums the size of a directory's contents
      * using {@link FileUtils#sizeOfDirectory(File)}
      */
-    public static final SizeFileComparator SIZE_SUMDIR_COMPARATOR = new SizeFileComparator(true);
+    public static final Comparator<File> SIZE_SUMDIR_COMPARATOR = new SizeFileComparator(true);
 
     /**
      * Reverse size comparator instance which sums the size of a directory's contents
      * using {@link FileUtils#sizeOfDirectory(File)}
      */
-    public static final ReverseComparator SIZE_SUMDIR_REVERSE = new ReverseComparator(SIZE_SUMDIR_COMPARATOR);
+    public static final Comparator<File> SIZE_SUMDIR_REVERSE = new ReverseComparator(SIZE_SUMDIR_COMPARATOR);
 
     /** Whether the sum of the directory's contents should be calculated. */
     private final boolean sumDirectoryContents;

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
Wed Apr 17 23:32:21 2013
@@ -58,7 +58,7 @@ public abstract class ComparatorAbstract
     /** @see junit.framework.TestCase#setUp() */
     @Override
     protected void setUp() throws Exception {
-        comparator = DefaultFileComparator.DEFAULT_COMPARATOR;
+        comparator = (AbstractFileComparator) DefaultFileComparator.DEFAULT_COMPARATOR;
         reverse = DefaultFileComparator.DEFAULT_REVERSE;
     }
 

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -41,8 +41,8 @@ public class CompositeFileComparatorTest
         super.setUp();
         comparator = new CompositeFileComparator(
                 new AbstractFileComparator[] {
-                    SizeFileComparator.SIZE_COMPARATOR,
-                    ExtensionFileComparator.EXTENSION_COMPARATOR});
+                    (AbstractFileComparator) SizeFileComparator.SIZE_COMPARATOR,
+                    (AbstractFileComparator) ExtensionFileComparator.EXTENSION_COMPARATOR});
         reverse = new ReverseComparator(comparator);
         final File dir = getTestDirectory();
         lessFile   = new File(dir, "xyz.txt");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -36,7 +36,7 @@ public class DefaultFileComparatorTest e
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        comparator = DefaultFileComparator.DEFAULT_COMPARATOR;
+        comparator = (AbstractFileComparator) DefaultFileComparator.DEFAULT_COMPARATOR;
         reverse = DefaultFileComparator.DEFAULT_REVERSE;
         equalFile1 = new File("foo");
         equalFile2 = new File("foo");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -36,7 +36,7 @@ public class DirectoryFileComparatorTest
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        comparator = DirectoryFileComparator.DIRECTORY_COMPARATOR;
+        comparator = (AbstractFileComparator) DirectoryFileComparator.DIRECTORY_COMPARATOR;
         reverse = DirectoryFileComparator.DIRECTORY_REVERSE;
         final File currentDir = new File(".");
         equalFile1 = new File(currentDir, "src");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -37,7 +37,7 @@ public class ExtensionFileComparatorTest
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        comparator = ExtensionFileComparator.EXTENSION_COMPARATOR;
+        comparator = (AbstractFileComparator) ExtensionFileComparator.EXTENSION_COMPARATOR;
         reverse = ExtensionFileComparator.EXTENSION_REVERSE;
         equalFile1 = new File("abc.foo");
         equalFile2 = new File("def.foo");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -36,7 +36,7 @@ public class LastModifiedFileComparatorT
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        comparator = LastModifiedFileComparator.LASTMODIFIED_COMPARATOR;
+        comparator = (AbstractFileComparator) LastModifiedFileComparator.LASTMODIFIED_COMPARATOR;
         reverse = LastModifiedFileComparator.LASTMODIFIED_REVERSE;
         final File dir = getTestDirectory();
         final File olderFile = new File(dir, "older.txt");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -37,7 +37,7 @@ public class NameFileComparatorTest exte
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        comparator = NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
+        comparator = (AbstractFileComparator) NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
         reverse = NameFileComparator.NAME_REVERSE;
         equalFile1 = new File("a/foo.txt");
         equalFile2 = new File("b/foo.txt");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -37,7 +37,7 @@ public class PathFileComparatorTest exte
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        comparator = PathFileComparator.PATH_COMPARATOR;
+        comparator = (AbstractFileComparator) PathFileComparator.PATH_COMPARATOR;
         reverse = PathFileComparator.PATH_REVERSE;
         equalFile1 = new File("foo/file.txt");
         equalFile2 = new File("foo/file.txt");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java?rev=1469102&r1=1469101&r2=1469102&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
(original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
Wed Apr 17 23:32:21 2013
@@ -41,7 +41,7 @@ public class SizeFileComparatorTest exte
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        comparator = SizeFileComparator.SIZE_COMPARATOR;
+        comparator = (AbstractFileComparator) SizeFileComparator.SIZE_COMPARATOR;
         reverse = SizeFileComparator.SIZE_REVERSE;
         final File dir = getTestDirectory();
         smallerDir = new File(dir, "smallerdir");



Mime
View raw message