From 9f5ab4ebed9aad38807cedd7f15248294c66fcf2 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 21 Oct 2005 03:53:14 +0000 Subject: [PATCH] revert parts of rev 327004 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@327090 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/types/ArchiveFileSet.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java index 8b6a3fb74..a40a37636 100755 --- a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java +++ b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java @@ -21,7 +21,6 @@ import java.util.Iterator; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.zip.UnixStat; @@ -62,7 +61,6 @@ public abstract class ArchiveFileSet extends FileSet { private boolean fileModeHasBeenSet = false; private boolean dirModeHasBeenSet = false; - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); /** Constructor for ArchiveFileSet */ public ArchiveFileSet() { @@ -143,11 +141,7 @@ public abstract class ArchiveFileSet extends FileSet { if (hasDir) { throw new BuildException("Cannot set both dir and src attributes"); } - if (getProject()!=null) { - this.src = new FileResource(FILE_UTILS.resolveFile(getProject().getBaseDir(),src.toString())); - } else { - this.src = new FileResource(new File(src.toString())); - } + this.src = src; } /**