ehatcher 2002/09/02 08:08:27
Modified: src/main/org/apache/tools/ant/types AbstractFileSet.java
Log:
refactored to be 1.1 compatible and allow filenames that contain spaces
Revision Changes Path
1.11 +6 -2
jakarta-ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java
Index: AbstractFileSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractFileSet.java 14 Aug 2002 14:28:00 -0000 1.10
+++ AbstractFileSet.java 2 Sep 2002 15:08:27 -0000 1.11
@@ -62,6 +62,7 @@
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 @@
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());
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
