Author: bodewig
Date: Thu Oct 20 12:30:39 2005
New Revision: 326984
URL: http://svn.apache.org/viewcvs?rev=326984&view=rev
Log:
only one setSrc method, otherwise it is not predictable which one is picked by
IntorspectionHelper
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java?rev=326984&r1=326983&r2=326984&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java Thu
Oct 20 12:30:39 2005
@@ -117,7 +117,7 @@
throw new BuildException("only single argument resource
collections"
+ " are supported as archives");
}
- setSrc((Resource) a.iterator().next());
+ setSrcResource((Resource) a.iterator().next());
}
/**
@@ -127,7 +127,7 @@
* @param srcFile The archive from which to extract entries.
*/
public void setSrc(File srcFile) {
- setSrc(new FileResource(srcFile));
+ setSrcResource(new FileResource(srcFile));
}
/**
@@ -136,7 +136,7 @@
*
* @param srcFile The archive from which to extract entries.
*/
- public void setSrc(Resource src) {
+ public void setSrcResource(Resource src) {
checkAttributesAllowed();
if (hasDir) {
throw new BuildException("Cannot set both dir and src attributes");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
