From 5e755270ba1e5287dc167a6c5f3d1e9918e37f9c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 20 Oct 2005 19:30:39 +0000 Subject: [PATCH] only one setSrc method, otherwise it is not predictable which one is picked by IntorspectionHelper git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@326984 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/types/ArchiveFileSet.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java index 814a10363..7ecfd2919 100755 --- a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java +++ b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java @@ -117,7 +117,7 @@ public abstract class ArchiveFileSet extends FileSet { 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 @@ public abstract class ArchiveFileSet extends FileSet { * @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 @@ public abstract class ArchiveFileSet extends FileSet { * * @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");