diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java index 4b9a9eb2a..b005e6a0d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java @@ -759,7 +759,7 @@ public class FixCRLF extends MatchingTask { // Compare the destination with the temp file log( "destFile exists", Project.MSG_DEBUG ); - if( !FileUtils.newFileUtils().contentEquals( destFile, tmpFile ) ) + if( !FileUtils.contentEquals( destFile, tmpFile ) ) { log( destFile + " is being written", Project.MSG_DEBUG ); if( !destFile.delete() ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 1af73afb2..88eb97f8b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -685,7 +685,7 @@ public class Rmic extends MatchingTask if( filtering ) { final FilterSetCollection filters = new FilterSetCollection( project.getGlobalFilterSet() ); - FileUtils.newFileUtils().copyFile( oldFile, newFile, filters ); + FileUtils.copyFile( oldFile, newFile, filters ); } else { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java index a045fe867..e1cd0f297 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java @@ -368,7 +368,7 @@ public class Copy FileUtil.forceDelete( dest ); } - FileUtils.newFileUtils().copyFile( src, dest, executionFilters ); + FileUtils.copyFile( src, dest, executionFilters ); if( m_preserveLastModified ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java index 30d257b64..539e0332f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java @@ -162,7 +162,7 @@ public class Move extends Copy { FileUtil.forceDelete( d ); } - FileUtils.newFileUtils().copyFile( f, d, executionFilters ); + FileUtils.copyFile( f, d, executionFilters ); f = new File( fromFile ); if( !f.delete() ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java index 8cbf67368..4cb9fecb8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java @@ -35,16 +35,6 @@ import org.apache.tools.ant.types.FilterSetCollection; public class FileUtils { - /** - * Factory method. - * - * @return Description of the Returned Value - */ - public static FileUtils newFileUtils() - { - return new FileUtils(); - } - /** * Compares the contents of two files. * @@ -54,7 +44,7 @@ public class FileUtils * @exception IOException Description of Exception * @since 1.9 */ - public boolean contentEquals( File f1, File f2 ) + public static boolean contentEquals( File f1, File f2 ) throws IOException { if( f1.exists() != f2.exists() ) @@ -135,9 +125,9 @@ public class FileUtils * @param preserveLastModified Description of Parameter * @throws IOException */ - public void copyFile( File sourceFile, - File destFile, - FilterSetCollection filters ) + public static void copyFile( File sourceFile, + File destFile, + FilterSetCollection filters ) throws IOException, TaskException { if( !destFile.exists() || @@ -218,7 +208,7 @@ public class FileUtils * @return Description of the Returned Value * @throws java.lang.NullPointerException if the file path is equal to null. */ - public File normalize( String path ) + public static File normalize( String path ) throws TaskException { String orig = path; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java index 4b9a9eb2a..b005e6a0d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java @@ -759,7 +759,7 @@ public class FixCRLF extends MatchingTask { // Compare the destination with the temp file log( "destFile exists", Project.MSG_DEBUG ); - if( !FileUtils.newFileUtils().contentEquals( destFile, tmpFile ) ) + if( !FileUtils.contentEquals( destFile, tmpFile ) ) { log( destFile + " is being written", Project.MSG_DEBUG ); if( !destFile.delete() ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java index 1af73afb2..88eb97f8b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java @@ -685,7 +685,7 @@ public class Rmic extends MatchingTask if( filtering ) { final FilterSetCollection filters = new FilterSetCollection( project.getGlobalFilterSet() ); - FileUtils.newFileUtils().copyFile( oldFile, newFile, filters ); + FileUtils.copyFile( oldFile, newFile, filters ); } else { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java index a045fe867..e1cd0f297 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java @@ -368,7 +368,7 @@ public class Copy FileUtil.forceDelete( dest ); } - FileUtils.newFileUtils().copyFile( src, dest, executionFilters ); + FileUtils.copyFile( src, dest, executionFilters ); if( m_preserveLastModified ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java index 30d257b64..539e0332f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java @@ -162,7 +162,7 @@ public class Move extends Copy { FileUtil.forceDelete( d ); } - FileUtils.newFileUtils().copyFile( f, d, executionFilters ); + FileUtils.copyFile( f, d, executionFilters ); f = new File( fromFile ); if( !f.delete() ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java index 8cbf67368..4cb9fecb8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java @@ -35,16 +35,6 @@ import org.apache.tools.ant.types.FilterSetCollection; public class FileUtils { - /** - * Factory method. - * - * @return Description of the Returned Value - */ - public static FileUtils newFileUtils() - { - return new FileUtils(); - } - /** * Compares the contents of two files. * @@ -54,7 +44,7 @@ public class FileUtils * @exception IOException Description of Exception * @since 1.9 */ - public boolean contentEquals( File f1, File f2 ) + public static boolean contentEquals( File f1, File f2 ) throws IOException { if( f1.exists() != f2.exists() ) @@ -135,9 +125,9 @@ public class FileUtils * @param preserveLastModified Description of Parameter * @throws IOException */ - public void copyFile( File sourceFile, - File destFile, - FilterSetCollection filters ) + public static void copyFile( File sourceFile, + File destFile, + FilterSetCollection filters ) throws IOException, TaskException { if( !destFile.exists() || @@ -218,7 +208,7 @@ public class FileUtils * @return Description of the Returned Value * @throws java.lang.NullPointerException if the file path is equal to null. */ - public File normalize( String path ) + public static File normalize( String path ) throws TaskException { String orig = path;