Author: bodewig
Date: Mon Nov 28 20:52:33 2005
New Revision: 349646
URL: http://svn.apache.org/viewcvs?rev=349646&view=rev
Log:
performance enhancement, without this getNonFilesetResourcesToAdd might get
invoked twice if the manifest changes
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java?rev=349646&r1=349645&r2=349646&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java Mon Nov 28
20:52:33 2005
@@ -46,6 +46,7 @@
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.ResourceCollection;
import org.apache.tools.ant.types.ZipFileSet;
import org.apache.tools.zip.JarMarker;
import org.apache.tools.zip.ZipExtraField;
@@ -633,7 +634,7 @@
* third arg if they already know that the archive is
* out-of-date.</p>
*
- * @param filesets The filesets to grab resources from
+ * @param rcs The resource collections to grab resources from
* @param zipFile intended archive file (may or may not exist)
* @param needsUpdate whether we already know that the archive is
* out-of-date. Subclasses overriding this method are supposed to
@@ -644,7 +645,7 @@
*
* @exception BuildException if it likes
*/
- protected ArchiveState getResourcesToAdd(FileSet[] filesets,
+ protected ArchiveState getResourcesToAdd(ResourceCollection[] rcs,
File zipFile,
boolean needsUpdate)
throws BuildException {
@@ -680,7 +681,7 @@
}
createEmpty = needsUpdate;
- return super.getResourcesToAdd(filesets, zipFile, needsUpdate);
+ return super.getResourcesToAdd(rcs, zipFile, needsUpdate);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
