ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r327090 - /ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
Date Fri, 21 Oct 2005 03:53:18 GMT
Author: bodewig
Date: Thu Oct 20 20:53:14 2005
New Revision: 327090

URL: http://svn.apache.org/viewcvs?rev=327090&view=rev
Log:
revert parts of rev 327004

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=327090&r1=327089&r2=327090&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 20:53:14
2005
@@ -21,7 +21,6 @@
 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 @@
 
     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 @@
         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;
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message