Browse Source

refactored to be 1.1 compatible and allow filenames that contain spaces

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273281 13f79535-47bb-0310-9956-ffa450edef68
master
Erik Hatcher 23 years ago
parent
commit
f914213e17
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      src/main/org/apache/tools/ant/types/AbstractFileSet.java

+ 6
- 2
src/main/org/apache/tools/ant/types/AbstractFileSet.java View File

@@ -62,6 +62,7 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.FileScanner; import org.apache.tools.ant.FileScanner;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.types.selectors.AndSelector; import org.apache.tools.ant.types.selectors.AndSelector;
import org.apache.tools.ant.types.selectors.ContainsSelector; import org.apache.tools.ant.types.selectors.ContainsSelector;
import org.apache.tools.ant.types.selectors.DateSelector; import org.apache.tools.ant.types.selectors.DateSelector;
@@ -220,8 +221,11 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
if (isReference()) { if (isReference()) {
throw tooManyAttributes(); throw tooManyAttributes();
} }
setDir(file.getParentFile());
setIncludes(file.getName());
FileUtils fileUtils = FileUtils.newFileUtils();
setDir(fileUtils.getParentFile(file));

PatternSet.NameEntry include = createInclude();
include.setName(file.getName());
} }


/** /**


Loading…
Cancel
Save