You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2005/09/28 21:55:38 UTC
svn commit: r292283 -
/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java
Author: bodewig
Date: Wed Sep 28 12:55:34 2005
New Revision: 292283
URL: http://svn.apache.org/viewcvs?rev=292283&view=rev
Log:
whitespace
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java?rev=292283&r1=292282&r2=292283&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java Wed Sep 28 12:55:34 2005
@@ -417,20 +417,20 @@
}
// deal with the ResourceCollections
- /* for historical and performance reasons we have to do
- things in a rather complex way.
-
- (1) Move is optimized to move directories if a fileset
- has been included completely, therefore FileSets need a
- special treatment. This is also required to support
- the failOnError semantice (skip filesets with broken
- basedir but handle the remaining collections).
-
- (2) We carry around a few protected methods that work
- on basedirs and arrays of names. To optimize stuff, all
- resources with the same basedir get collected in
- separate lists and then each list is handled in one go.
- */
+ /* for historical and performance reasons we have to do
+ things in a rather complex way.
+
+ (1) Move is optimized to move directories if a fileset
+ has been included completely, therefore FileSets need a
+ special treatment. This is also required to support
+ the failOnError semantice (skip filesets with broken
+ basedir but handle the remaining collections).
+
+ (2) We carry around a few protected methods that work
+ on basedirs and arrays of names. To optimize stuff, all
+ resources with the same basedir get collected in
+ separate lists and then each list is handled in one go.
+ */
HashMap filesByBasedir = new HashMap();
HashMap dirsByBasedir = new HashMap();
@@ -488,7 +488,7 @@
File f = (File) iter.next();
List files = (List) filesByBasedir.get(f);
List dirs = (List) dirsByBasedir.get(f);
-
+
String[] srcFiles = new String[0];
if (files != null) {
srcFiles = (String[]) files.toArray(srcFiles);
@@ -498,7 +498,7 @@
srcDirs = (String[]) dirs.toArray(srcDirs);
}
scan(f == NULL_FILE_PLACEHOLDER ? null : f, destDir,
- srcFiles, srcDirs);
+ srcFiles, srcDirs);
}
} else { // not a File resource collection
throw new BuildException(
@@ -563,7 +563,7 @@
ResourceCollection rc = (ResourceCollection) rcs.elementAt(0);
if (!rc.isFilesystemOnly()) {
throw new BuildException("Only FileSystem resources are"
- + " supported.");
+ + " supported.");
}
if (rc.size() == 0) {
throw new BuildException(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org