You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2012/08/29 15:28:13 UTC
svn commit: r1378539 - in /commons/proper/io/trunk/src: changes/
main/java/org/apache/commons/io/comparator/
test/java/org/apache/commons/io/comparator/
Author: ggregory
Date: Wed Aug 29 13:28:12 2012
New Revision: 1378539
URL: http://svn.apache.org/viewvc?rev=1378539&view=rev
Log:
[IO-343] org.apache.commons.io.comparator Javadoc is inconsistent with real code.
Modified:
commons/proper/io/trunk/src/changes/changes.xml
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/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/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/changes/changes.xml?rev=1378539&r1=1378538&r2=1378539&view=diff
==============================================================================
--- commons/proper/io/trunk/src/changes/changes.xml (original)
+++ commons/proper/io/trunk/src/changes/changes.xml Wed Aug 29 13:28:12 2012
@@ -47,6 +47,9 @@ The <action> type attribute can be add,u
<body>
<!-- The release date is the date RC is cut -->
<release version="2.4" date="2012-06-12" description="New features and bug fixes.">
+ <action issue="IO-343" dev="ggregory" type="fix" due-to="igorlash">
+ org.apache.commons.io.comparator Javadoc is inconsistent with real code.
+ </action>
<action issue="IO-336" dev="ggregory" type="fix" due-to="rleavelle">
Yottabyte (YB) incorrectly defined in FileUtils.
</action>
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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -18,7 +18,6 @@ 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.
@@ -46,11 +45,11 @@ import java.util.Comparator;
*/
public class DefaultFileComparator extends AbstractFileComparator implements Serializable {
- /** Singleton default comparator instance */
- public static final Comparator<File> DEFAULT_COMPARATOR = new DefaultFileComparator();
+ /** Singleton default comparator instance */
+ public static final DefaultFileComparator DEFAULT_COMPARATOR = new DefaultFileComparator();
/** Singleton reverse default comparator instance */
- public static final Comparator<File> DEFAULT_REVERSE = new ReverseComparator(DEFAULT_COMPARATOR);
+ public static final ReverseComparator 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -18,7 +18,6 @@ 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.
@@ -45,11 +44,12 @@ import java.util.Comparator;
*/
public class DirectoryFileComparator extends AbstractFileComparator implements Serializable {
- /** Singleton default comparator instance */
- public static final Comparator<File> DIRECTORY_COMPARATOR = new DirectoryFileComparator();
+
+ /** Singleton default comparator instance */
+ public static final DirectoryFileComparator DIRECTORY_COMPARATOR = new DirectoryFileComparator();
/** Singleton reverse default comparator instance */
- public static final Comparator<File> DIRECTORY_REVERSE = new ReverseComparator(DIRECTORY_COMPARATOR);
+ public static final ReverseComparator 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -18,7 +18,6 @@ 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;
@@ -54,24 +53,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 Comparator<File> EXTENSION_COMPARATOR = new ExtensionFileComparator();
+ public static final ExtensionFileComparator EXTENSION_COMPARATOR = new ExtensionFileComparator();
/** Reverse case-sensitive extension comparator instance (see {@link IOCase#SENSITIVE}) */
- public static final Comparator<File> EXTENSION_REVERSE = new ReverseComparator(EXTENSION_COMPARATOR);
+ public static final ReverseComparator EXTENSION_REVERSE = new ReverseComparator(EXTENSION_COMPARATOR);
/** Case-insensitive extension comparator instance (see {@link IOCase#INSENSITIVE}) */
- public static final Comparator<File> EXTENSION_INSENSITIVE_COMPARATOR
+ public static final ExtensionFileComparator EXTENSION_INSENSITIVE_COMPARATOR
= new ExtensionFileComparator(IOCase.INSENSITIVE);
/** Reverse case-insensitive extension comparator instance (see {@link IOCase#INSENSITIVE}) */
- public static final Comparator<File> EXTENSION_INSENSITIVE_REVERSE
+ public static final ReverseComparator EXTENSION_INSENSITIVE_REVERSE
= new ReverseComparator(EXTENSION_INSENSITIVE_COMPARATOR);
/** System sensitive extension comparator instance (see {@link IOCase#SYSTEM}) */
- public static final Comparator<File> EXTENSION_SYSTEM_COMPARATOR = new ExtensionFileComparator(IOCase.SYSTEM);
+ public static final ExtensionFileComparator EXTENSION_SYSTEM_COMPARATOR = new ExtensionFileComparator(IOCase.SYSTEM);
/** Reverse system sensitive path comparator instance (see {@link IOCase#SYSTEM}) */
- public static final Comparator<File> EXTENSION_SYSTEM_REVERSE = new ReverseComparator(EXTENSION_SYSTEM_COMPARATOR);
+ public static final ReverseComparator 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -18,7 +18,6 @@ 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
@@ -48,10 +47,10 @@ import java.util.Comparator;
public class LastModifiedFileComparator extends AbstractFileComparator implements Serializable {
/** Last modified comparator instance */
- public static final Comparator<File> LASTMODIFIED_COMPARATOR = new LastModifiedFileComparator();
+ public static final LastModifiedFileComparator LASTMODIFIED_COMPARATOR = new LastModifiedFileComparator();
/** Reverse last modified comparator instance */
- public static final Comparator<File> LASTMODIFIED_REVERSE = new ReverseComparator(LASTMODIFIED_COMPARATOR);
+ public static final ReverseComparator 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -18,7 +18,6 @@ package org.apache.commons.io.comparator
import java.io.File;
import java.io.Serializable;
-import java.util.Comparator;
import org.apache.commons.io.IOCase;
@@ -52,22 +51,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 Comparator<File> NAME_COMPARATOR = new NameFileComparator();
+ public static final NameFileComparator NAME_COMPARATOR = new NameFileComparator();
/** Reverse case-sensitive name comparator instance (see {@link IOCase#SENSITIVE}) */
- public static final Comparator<File> NAME_REVERSE = new ReverseComparator(NAME_COMPARATOR);
+ public static final ReverseComparator NAME_REVERSE = new ReverseComparator(NAME_COMPARATOR);
/** Case-insensitive name comparator instance (see {@link IOCase#INSENSITIVE}) */
- public static final Comparator<File> NAME_INSENSITIVE_COMPARATOR = new NameFileComparator(IOCase.INSENSITIVE);
+ public static final NameFileComparator NAME_INSENSITIVE_COMPARATOR = new NameFileComparator(IOCase.INSENSITIVE);
/** Reverse case-insensitive name comparator instance (see {@link IOCase#INSENSITIVE}) */
- public static final Comparator<File> NAME_INSENSITIVE_REVERSE = new ReverseComparator(NAME_INSENSITIVE_COMPARATOR);
+ public static final ReverseComparator NAME_INSENSITIVE_REVERSE = new ReverseComparator(NAME_INSENSITIVE_COMPARATOR);
/** System sensitive name comparator instance (see {@link IOCase#SYSTEM}) */
- public static final Comparator<File> NAME_SYSTEM_COMPARATOR = new NameFileComparator(IOCase.SYSTEM);
+ public static final NameFileComparator NAME_SYSTEM_COMPARATOR = new NameFileComparator(IOCase.SYSTEM);
/** Reverse system sensitive name comparator instance (see {@link IOCase#SYSTEM}) */
- public static final Comparator<File> NAME_SYSTEM_REVERSE = new ReverseComparator(NAME_SYSTEM_COMPARATOR);
+ public static final ReverseComparator 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -18,7 +18,6 @@ package org.apache.commons.io.comparator
import java.io.File;
import java.io.Serializable;
-import java.util.Comparator;
import org.apache.commons.io.IOCase;
@@ -52,22 +51,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 Comparator<File> PATH_COMPARATOR = new PathFileComparator();
+ public static final PathFileComparator PATH_COMPARATOR = new PathFileComparator();
/** Reverse case-sensitive path comparator instance (see {@link IOCase#SENSITIVE}) */
- public static final Comparator<File> PATH_REVERSE = new ReverseComparator(PATH_COMPARATOR);
+ public static final ReverseComparator PATH_REVERSE = new ReverseComparator(PATH_COMPARATOR);
/** Case-insensitive path comparator instance (see {@link IOCase#INSENSITIVE}) */
- public static final Comparator<File> PATH_INSENSITIVE_COMPARATOR = new PathFileComparator(IOCase.INSENSITIVE);
+ public static final PathFileComparator PATH_INSENSITIVE_COMPARATOR = new PathFileComparator(IOCase.INSENSITIVE);
/** Reverse case-insensitive path comparator instance (see {@link IOCase#INSENSITIVE}) */
- public static final Comparator<File> PATH_INSENSITIVE_REVERSE = new ReverseComparator(PATH_INSENSITIVE_COMPARATOR);
+ public static final ReverseComparator PATH_INSENSITIVE_REVERSE = new ReverseComparator(PATH_INSENSITIVE_COMPARATOR);
/** System sensitive path comparator instance (see {@link IOCase#SYSTEM}) */
- public static final Comparator<File> PATH_SYSTEM_COMPARATOR = new PathFileComparator(IOCase.SYSTEM);
+ public static final PathFileComparator PATH_SYSTEM_COMPARATOR = new PathFileComparator(IOCase.SYSTEM);
/** Reverse system sensitive path comparator instance (see {@link IOCase#SYSTEM}) */
- public static final Comparator<File> PATH_SYSTEM_REVERSE = new ReverseComparator(PATH_SYSTEM_COMPARATOR);
+ public static final ReverseComparator 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -18,7 +18,6 @@ package org.apache.commons.io.comparator
import java.io.File;
import java.io.Serializable;
-import java.util.Comparator;
import org.apache.commons.io.FileUtils;
@@ -52,22 +51,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 Comparator<File> SIZE_COMPARATOR = new SizeFileComparator();
+ public static final SizeFileComparator SIZE_COMPARATOR = new SizeFileComparator();
/** Reverse size comparator instance - directories are treated as zero size */
- public static final Comparator<File> SIZE_REVERSE = new ReverseComparator(SIZE_COMPARATOR);
+ public static final ReverseComparator 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 Comparator<File> SIZE_SUMDIR_COMPARATOR = new SizeFileComparator(true);
+ public static final SizeFileComparator 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 Comparator<File> SIZE_SUMDIR_REVERSE = new ReverseComparator(SIZE_SUMDIR_COMPARATOR);
+ public static final ReverseComparator 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -58,7 +58,7 @@ public abstract class ComparatorAbstract
/** @see junit.framework.TestCase#setUp() */
@Override
protected void setUp() throws Exception {
- comparator = (AbstractFileComparator)DefaultFileComparator.DEFAULT_COMPARATOR;
+ comparator = DefaultFileComparator.DEFAULT_COMPARATOR;
reverse = DefaultFileComparator.DEFAULT_REVERSE;
}
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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -36,7 +36,7 @@ public class DefaultFileComparatorTest e
@Override
protected void setUp() throws Exception {
super.setUp();
- comparator = (AbstractFileComparator)DefaultFileComparator.DEFAULT_COMPARATOR;
+ comparator = 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -36,7 +36,7 @@ public class DirectoryFileComparatorTest
@Override
protected void setUp() throws Exception {
super.setUp();
- comparator = (AbstractFileComparator)DirectoryFileComparator.DIRECTORY_COMPARATOR;
+ comparator = DirectoryFileComparator.DIRECTORY_COMPARATOR;
reverse = DirectoryFileComparator.DIRECTORY_REVERSE;
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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -37,7 +37,7 @@ public class ExtensionFileComparatorTest
@Override
protected void setUp() throws Exception {
super.setUp();
- comparator = (AbstractFileComparator)ExtensionFileComparator.EXTENSION_COMPARATOR;
+ comparator = 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -36,7 +36,7 @@ public class LastModifiedFileComparatorT
@Override
protected void setUp() throws Exception {
super.setUp();
- comparator = (AbstractFileComparator)LastModifiedFileComparator.LASTMODIFIED_COMPARATOR;
+ comparator = LastModifiedFileComparator.LASTMODIFIED_COMPARATOR;
reverse = LastModifiedFileComparator.LASTMODIFIED_REVERSE;
File dir = getTestDirectory();
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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -37,7 +37,7 @@ public class NameFileComparatorTest exte
@Override
protected void setUp() throws Exception {
super.setUp();
- comparator = (AbstractFileComparator)NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
+ comparator = 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -37,7 +37,7 @@ public class PathFileComparatorTest exte
@Override
protected void setUp() throws Exception {
super.setUp();
- comparator = (AbstractFileComparator)PathFileComparator.PATH_COMPARATOR;
+ comparator = 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=1378539&r1=1378538&r2=1378539&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 Aug 29 13:28:12 2012
@@ -41,7 +41,7 @@ public class SizeFileComparatorTest exte
@Override
protected void setUp() throws Exception {
super.setUp();
- comparator = (AbstractFileComparator)SizeFileComparator.SIZE_COMPARATOR;
+ comparator = SizeFileComparator.SIZE_COMPARATOR;
reverse = SizeFileComparator.SIZE_REVERSE;
File dir = getTestDirectory();
smallerDir = new File(dir, "smallerdir");