From 8ddcf3388aa2e4dfda564dc0d48c695cf2fbd782 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 3 Feb 2002 03:41:18 +0000 Subject: [PATCH] Minor touchups git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271109 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/file/Copy.java | 36 ++++++------------- .../apache/tools/ant/taskdefs/file/Move.java | 2 +- .../apache/tools/ant/taskdefs/file/Copy.java | 36 ++++++------------- .../apache/tools/ant/taskdefs/file/Move.java | 2 +- 4 files changed, 24 insertions(+), 52 deletions(-) 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 4f3628afb..dcd4a0bef 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 @@ -15,18 +15,18 @@ import java.util.Hashtable; import java.util.Iterator; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; -import org.apache.tools.ant.util.mappers.Mapper; -import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.util.mappers.FlatFileNameMapper; import org.apache.tools.ant.util.mappers.IdentityMapper; -import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.util.mappers.Mapper; /** * A consolidated copy task. Copies a file or directory to a new file or @@ -53,7 +53,7 @@ public class Copy private boolean m_filtering; private boolean m_preserveLastModified; - private boolean m_forceOverwrite; + private boolean m_overwrite; private boolean m_flatten; private boolean m_includeEmpty = true; @@ -114,7 +114,7 @@ public class Copy */ public void setOverwrite( final boolean overwrite ) { - m_forceOverwrite = overwrite; + m_overwrite = overwrite; } /** @@ -207,7 +207,7 @@ public class Copy m_destFile = new File( m_destDir, m_file.getName() ); } - if( m_forceOverwrite || + if( m_overwrite || ( m_file.lastModified() > m_destFile.lastModified() ) ) { m_fileCopyMap.put( m_file.getAbsolutePath(), m_destFile.getAbsolutePath() ); @@ -291,7 +291,7 @@ public class Copy final File toDir ) throws TaskException { - if( m_forceOverwrite ) + if( m_overwrite ) { final ArrayList list = new ArrayList( names.length ); for( int i = 0; i < names.length; i++ ) @@ -346,7 +346,7 @@ public class Copy final File src = new File( fromFile ); final File dest = new File( toFile ); - if( m_forceOverwrite ) + if( m_overwrite ) { FileUtil.forceDelete( dest ); } @@ -415,11 +415,6 @@ public class Copy /** * Compares source files to destination files to see if they should be * copied. - * - * @param fromDir Description of Parameter - * @param toDir Description of Parameter - * @param files Description of Parameter - * @param dirs Description of Parameter */ protected void scan( File fromDir, File toDir, String[] files, String[] dirs ) throws TaskException @@ -446,10 +441,6 @@ public class Copy } } - //************************************************************************ - // protected and private methods - //************************************************************************ - /** * Ensure we have a consistent and legal set of attributes, and set any * internal flags necessary based on different combinations of attributes. @@ -531,7 +522,7 @@ public class Copy protected boolean isForceOverwrite() { - return m_forceOverwrite; + return m_overwrite; } protected boolean isIncludeEmpty() @@ -558,9 +549,4 @@ public class Copy { return m_destDir; } - - protected void setForceOverwrite( final boolean forceOverwrite ) - { - m_forceOverwrite = forceOverwrite; - } } 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 cd693ae0c..63b03387a 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 @@ -38,7 +38,7 @@ public class Move { public Move() { - setForceOverwrite( true ); + setOverwrite( true ); } /** 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 4f3628afb..dcd4a0bef 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 @@ -15,18 +15,18 @@ import java.util.Hashtable; import java.util.Iterator; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; -import org.apache.tools.ant.util.mappers.Mapper; -import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.util.mappers.FlatFileNameMapper; import org.apache.tools.ant.util.mappers.IdentityMapper; -import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.util.mappers.Mapper; /** * A consolidated copy task. Copies a file or directory to a new file or @@ -53,7 +53,7 @@ public class Copy private boolean m_filtering; private boolean m_preserveLastModified; - private boolean m_forceOverwrite; + private boolean m_overwrite; private boolean m_flatten; private boolean m_includeEmpty = true; @@ -114,7 +114,7 @@ public class Copy */ public void setOverwrite( final boolean overwrite ) { - m_forceOverwrite = overwrite; + m_overwrite = overwrite; } /** @@ -207,7 +207,7 @@ public class Copy m_destFile = new File( m_destDir, m_file.getName() ); } - if( m_forceOverwrite || + if( m_overwrite || ( m_file.lastModified() > m_destFile.lastModified() ) ) { m_fileCopyMap.put( m_file.getAbsolutePath(), m_destFile.getAbsolutePath() ); @@ -291,7 +291,7 @@ public class Copy final File toDir ) throws TaskException { - if( m_forceOverwrite ) + if( m_overwrite ) { final ArrayList list = new ArrayList( names.length ); for( int i = 0; i < names.length; i++ ) @@ -346,7 +346,7 @@ public class Copy final File src = new File( fromFile ); final File dest = new File( toFile ); - if( m_forceOverwrite ) + if( m_overwrite ) { FileUtil.forceDelete( dest ); } @@ -415,11 +415,6 @@ public class Copy /** * Compares source files to destination files to see if they should be * copied. - * - * @param fromDir Description of Parameter - * @param toDir Description of Parameter - * @param files Description of Parameter - * @param dirs Description of Parameter */ protected void scan( File fromDir, File toDir, String[] files, String[] dirs ) throws TaskException @@ -446,10 +441,6 @@ public class Copy } } - //************************************************************************ - // protected and private methods - //************************************************************************ - /** * Ensure we have a consistent and legal set of attributes, and set any * internal flags necessary based on different combinations of attributes. @@ -531,7 +522,7 @@ public class Copy protected boolean isForceOverwrite() { - return m_forceOverwrite; + return m_overwrite; } protected boolean isIncludeEmpty() @@ -558,9 +549,4 @@ public class Copy { return m_destDir; } - - protected void setForceOverwrite( final boolean forceOverwrite ) - { - m_forceOverwrite = forceOverwrite; - } } 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 cd693ae0c..63b03387a 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 @@ -38,7 +38,7 @@ public class Move { public Move() { - setForceOverwrite( true ); + setOverwrite( true ); } /**