From f914213e1775664ca1860bf2e3c4eb2adbed6c3c Mon Sep 17 00:00:00 2001 From: Erik Hatcher Date: Mon, 2 Sep 2002 15:08:27 +0000 Subject: [PATCH] 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 --- src/main/org/apache/tools/ant/types/AbstractFileSet.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 911f0dec0..e19580343 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -62,6 +62,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.FileScanner; 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.ContainsSelector; import org.apache.tools.ant.types.selectors.DateSelector; @@ -220,8 +221,11 @@ public abstract class AbstractFileSet extends DataType implements Cloneable, if (isReference()) { throw tooManyAttributes(); } - setDir(file.getParentFile()); - setIncludes(file.getName()); + FileUtils fileUtils = FileUtils.newFileUtils(); + setDir(fileUtils.getParentFile(file)); + + PatternSet.NameEntry include = createInclude(); + include.setName(file.getName()); } /**