diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2002-03-13 17:40:34 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2002-03-13 17:40:34 +0000 |
| commit | 56ff80265761eda3f54ef343c3654dd1aa4cce0c (patch) | |
| tree | 56ca3d6b054f7edfe5c1f06f131d81656f2111ed /java/ant/Slice2FreezeJTask.java | |
| parent | Added project files for Freeze/library demo (diff) | |
| download | ice-56ff80265761eda3f54ef343c3654dd1aa4cce0c.tar.bz2 ice-56ff80265761eda3f54ef343c3654dd1aa4cce0c.tar.xz ice-56ff80265761eda3f54ef343c3654dd1aa4cce0c.zip | |
Added Freeze/library demo.
Diffstat (limited to 'java/ant/Slice2FreezeJTask.java')
| -rw-r--r-- | java/ant/Slice2FreezeJTask.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/java/ant/Slice2FreezeJTask.java b/java/ant/Slice2FreezeJTask.java index fe360eb93dd..e10ff48d3b9 100644 --- a/java/ant/Slice2FreezeJTask.java +++ b/java/ant/Slice2FreezeJTask.java @@ -117,11 +117,10 @@ public class Slice2FreezeJTask extends org.apache.tools.ant.Task public FileSet createFileset() { - if (_fileSet == null) - { - _fileSet = new FileSet(); - } - return _fileSet; + FileSet fileset = new FileSet(); + _fileSets.add(fileset); + + return fileset; } public Dict @@ -147,21 +146,24 @@ public class Slice2FreezeJTask extends org.apache.tools.ant.Task boolean build = false; java.util.List sliceFiles = new java.util.LinkedList(); - if (_fileSet != null) + java.util.Iterator p = _fileSets.iterator(); + while (p.hasNext()) { - DirectoryScanner scanner = _fileSet.getDirectoryScanner(project); + FileSet fileset = (FileSet)p.next(); + + DirectoryScanner scanner = fileset.getDirectoryScanner(project); String[] files = scanner.getIncludedFiles(); for (int i = 0; i < files.length; i++) { - File slice = new File(_fileSet.getDir(project), files[i]); + File slice = new File(fileset.getDir(project), files[i]); sliceFiles.add(slice); } } java.util.List tagFiles = new java.util.LinkedList(); - java.util.Iterator p = _dicts.iterator(); + p = _dicts.iterator(); while (p.hasNext()) { // @@ -289,7 +291,7 @@ public class Slice2FreezeJTask extends org.apache.tools.ant.Task private File _tagDir = new File("."); private File _outputDir = null; private Path _includePath = null; - private FileSet _fileSet = null; + private java.util.List _fileSets = new java.util.LinkedList(); public class Dict { |