true, all generated
+ files will be placed directly within the directory specified
+ through the destdir attribute, without any
+ intermediate subdirectories. When set to false the
+ structure of the source tree is reproduced.
+ This attribute is ignored when a nested mapper
+ element is given. For backwards compatibility reasons, this
+ attribute defaults to true.
+
You can use fileset elements to select input
@@ -518,6 +534,13 @@
to use
filesets.
Furthermore, you can use a mapper element to
+ flexibly control the output file name for every input
+ file. See the
+ Ant documentation to learn how
+ to use
+ mappers.
+
SVGConverter with an explicit destination for each source.
+ *
+ * @author Martin von Gagern
+ * @version $Id$
+ */
+class RasterizerTaskSVGConverter extends SVGConverter {
+
+ // -- Variables ----------------------------------------------------------
+
+ /**
+ * Ant task that is used to log messages.
+ */
+ private Task executingTask;
+
+ /**
+ * List of sources.
+ * Elements are expected to be {@link File}s.
+ * It is not possible (yet) to reference parts of a file or an URL
+ * in this way.
+ */
+ private List sourceFiles;
+
+ /**
+ * List of destinations.
+ * Elements are expected to be {@link File}s.
+ * If appendFileNames is true, the items of
+ * this list are interpreted as directories, and default file names
+ * derived from the names of the corresponding source files will be
+ * appended. Otherwise, the item will be interpreted as a file name
+ * in its own right.
+ */
+ private List destinations;
+
+ /**
+ * Determines whether to append file names to destination paths.
+ */
+ private boolean appendFileNames;
+
+
+ // -- Constructors -------------------------------------------------------
+
+ /**
+ * Sets the given Ant task to receive log messages.
+ * The value can be null when log messages won't be written.
+ *
+ * @param task Ant task to receive log messages or null
+ */
+ public RasterizerTaskSVGConverter(Task task) {
+ super(new RasterizerTaskSVGConverterController(task));
+ executingTask = task;
+ }
+
+ // -- Public interface ---------------------------------------------------
+
+ public void setSourceFiles(List sources) {
+ this.sourceFiles = sources;
+ }
+
+ public void setDestinationFiles(List destinations) {
+ this.destinations = destinations;
+ appendFileNames = false;
+ }
+
+ public void setDestinationDirectories(List destinations) {
+ this.destinations = destinations;
+ appendFileNames = true;
+ }
+
+
+ // -- Overrides to protected interface -----------------------------------
+
+ protected List computeSources() throws SVGConverterException {
+ List sources = new ArrayList(sourceFiles.size());
+ for (int i = 0; i < sourceFiles.size(); ++i) {
+ File file = (File)sourceFiles.get(i);
+ SVGConverterSource source;
+ source = new SVGConverterFileSource(file);
+ sources.add(source);
+ }
+ return sources;
+ }
+
+ protected List computeDstFiles(List sources)
+ throws SVGConverterException {
+ if (destinations.size() != sources.size())
+ throw new IllegalStateException("Length mismatch: " +
+ destinations.size() + " destinations for " +
+ sources.size() + " sources");
+ if (!appendFileNames)
+ return destinations;
+ List destFiles = new ArrayList(destinations.size());
+ for (int i = 0; i < destinations.size(); ++i) {
+ SVGConverterSource src = (SVGConverterSource)sources.get(i);
+ File dir = (File)destinations.get(i);
+ String name = getDestinationFile(src.getName());
+ File file = new File(dir, name);
+ destFiles.add(file);
+ }
+ return destFiles;
+ }
+
+}
Index: contrib/rasterizertask/sources/org/apache/tools/ant/taskdefs/optional/RasterizerTaskSVGConverterController.java
===================================================================
--- contrib/rasterizertask/sources/org/apache/tools/ant/taskdefs/optional/RasterizerTaskSVGConverterController.java (revision 759159)
+++ contrib/rasterizertask/sources/org/apache/tools/ant/taskdefs/optional/RasterizerTaskSVGConverterController.java (working copy)
@@ -83,6 +83,11 @@
public boolean proceedWithSourceTranscoding(SVGConverterSource source,
File dest) {
+ if(executingTask != null) {
+ executingTask.log("Converting '"
+ + source.toString() + "' to '"
+ + dest.toString() + "'.");
+ }
return true;
}
Index: contrib/rasterizertask/sources/org/apache/tools/ant/taskdefs/optional/RasterizerTask.java
===================================================================
--- contrib/rasterizertask/sources/org/apache/tools/ant/taskdefs/optional/RasterizerTask.java (revision 759159)
+++ contrib/rasterizertask/sources/org/apache/tools/ant/taskdefs/optional/RasterizerTask.java (working copy)
@@ -26,10 +26,11 @@
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Mapper;
import org.apache.tools.ant.util.JAXPUtils;
+import org.apache.tools.ant.util.FileNameMapper;
// -- Batik classes ----------------------------------------------------------
-import org.apache.batik.apps.rasterizer.SVGConverter;
import org.apache.batik.apps.rasterizer.DestinationType;
import org.apache.batik.apps.rasterizer.SVGConverterException;
import org.apache.batik.transcoder.image.JPEGTranscoder;
@@ -47,6 +48,7 @@
import java.util.Iterator;
import java.util.ArrayList;
import java.util.List;
+import java.util.Collections;
@@ -116,9 +118,13 @@
protected File destDir = null;
/** Contents of fileset elements. */
protected Vector filesets = new Vector();
+ /** Contents of mapper elements. */
+ protected Mapper mapperElement = null;
+ /** Whether to strip directories from resulting paths. */
+ protected boolean flatten = true;
/** Converter object used to convert SVG images to raster images. */
- protected SVGConverter converter;
+ protected RasterizerTaskSVGConverter converter;
@@ -127,7 +133,6 @@
* Initializes a new rasterizer task.
*/
public RasterizerTask() {
- converter = new SVGConverter(new RasterizerTaskSVGConverterController(this));
}
@@ -323,6 +328,23 @@
}
/**
+ * Sets flatten attribute value.
+ *
+ * If this attribute is set to true, all generated
+ * files will be placed directly within the directory specified
+ * through the destdir attribute, without any
+ * intermediate subdirectories. When set to false the
+ * structure of the source tree is reproduced.
This attribute is ignored when a nested mapper
+ * element is given. For backwards compatibility reasons, this
+ * attribute defaults to true.
fileset elements.
*
* fileset elements can be used when there are many files
@@ -335,6 +357,31 @@
}
/**
+ * Creates mapper child element.
+ *
+ *
A mapper element can be used to specify
+ * the output file(s) for every input file in a flexible way.
mapper element to be configured by Ant
+ */
+ public Mapper createMapper() throws BuildException {
+ if (mapperElement != null) {
+ throw new BuildException("Cannot define more than one mapper",
+ getLocation());
+ }
+ mapperElement = new Mapper(getProject());
+ return mapperElement;
+ }
+
+ /**
+ * Add a nested file name mapper.
+ * @param fileNameMapper the mapper to add.
+ */
+ public void add(FileNameMapper fileNameMapper) {
+ createMapper().add(fileNameMapper);
+ }
+
+ /**
* Validates and sets input values and files, then starts the conversion
* process.
*
@@ -345,8 +392,6 @@
*/
public void execute() throws BuildException {
- String[] sources; // Array of input files.
-
// Store default XML parser information and set user class.
String defaultParser = XMLResourceDescriptor.getXMLParserClassName();
// Throws BuildException.
@@ -367,26 +412,23 @@
}
}
+ // Actually create our converter
+ converter = new RasterizerTaskSVGConverter(this);
+
// Throws BuildException.
setRasterizingParameters();
- // Get and set source(s).
- sources = getSourceFiles();
- converter.setSources(sources);
+ // Get and set source(s) and destination(s).
+ setFileLists();
- // Set destination.
- if(this.srcFile != null) {
- converter.setDst(this.destFile);
- } else {
- converter.setDst(this.destDir);
- }
-
// Input filenames are stored in the converter and
// everything is ready for the conversion.
+ /*
log("Rasterizing " + sources.length +
(sources.length == 1 ? " image " : " images ") +
"from SVG to " + this.resultType.toString() + ".");
+ */
try {
converter.execute();
@@ -394,6 +436,8 @@
throw new BuildException(sce.getMessage());
}
} finally {
+ converter = null; // just to make sure it won't be reused
+
// Restore default XML parser for the next execute.
XMLResourceDescriptor.setXMLParserClassName(defaultParser);
}
@@ -487,51 +531,76 @@
*
* @return Array of source filename strings.
*/
- protected String[] getSourceFiles() {
+ protected void setFileLists() {
- List inputFiles = new ArrayList(); // Input files in temp list.
-
if(this.srcFile != null) {
// Only one source and destination file have been set.
- inputFiles.add(this.srcFile.getAbsolutePath());
+ List srcs = Collections.singletonList(srcFile);
+ List dests = Collections.singletonList(destFile);
+ converter.setSourceFiles(srcs);
+ converter.setDestinationFiles(dests);
} else {
// Unknown number of files have to be converted. destdir
// attribute and either srcdir attribute or fileset element
// have been set.
+ List srcs = new ArrayList(); // Input files
+ List dests = new ArrayList(); // Output dirs or files
+ List filesets = this.filesets; // local reference, modifyable
+ FileNameMapper mapper = null;
+ if (mapperElement != null)
+ mapper = mapperElement.getImplementation();
+
// Read source files from the child patterns.
// The value of srcdir attribute overrides the dir attribute in
// fileset element.
if(this.srcDir != null) {
// fileset is declared in the super class.
- // Scan to get all the files in srcdir directory that
- // should be in input files.
+ // Add to list of filesets in order to get all the files
+ // in srcdir directory that should be in input files.
fileset.setDir(this.srcDir);
- DirectoryScanner ds = fileset.getDirectoryScanner(project);
- String[] includedFiles = ds.getIncludedFiles();
- // Add file and its path to the input file vector.
- for (int j = 0 ; j < includedFiles.length ; j++) {
- File newFile = new File(srcDir.getPath(), includedFiles[j]);
- inputFiles.add(newFile.getAbsolutePath());
- }
+ filesets = new ArrayList(filesets); // local copy, just in case
+ filesets.add(fileset);
}
- // Read source files from child filesets.
+
+ // Read source files from child filesets and child patterns.
for (int i = 0 ; i < filesets.size() ; i++) {
// Scan to get all the files in this fileset that
// should be in input files.
- FileSet fs = (FileSet) filesets.elementAt(i);
+ FileSet fs = (FileSet) filesets.get(i);
+ File fsDir = fs.getDir(project);
DirectoryScanner ds = fs.getDirectoryScanner(project);
String[] includedFiles = ds.getIncludedFiles();
// Add file and its path to the input file vector.
for (int j = 0 ; j < includedFiles.length ; j++) {
- File newFile = new File(fs.getDir(project).getPath(), includedFiles[j]);
- inputFiles.add(newFile.getAbsolutePath());
+ File src = new File(fsDir, includedFiles[j]);
+ if (mapper != null) {
+ String[] mapped = mapper.mapFileName(includedFiles[j]);
+ if (mapped != null) {
+ for (int k = 0; k < mapped.length; ++k) {
+ File dest = new File(destDir, mapped[k]);
+ srcs.add(src);
+ dests.add(dest);
+ }
+ }
+ }
+ else if (flatten) {
+ dests.add(destDir);
+ }
+ else {
+ File dest = new File(destDir, includedFiles[j]);
+ srcs.add(src);
+ dests.add(dest.getParentFile()); // destination dir
+ }
}
}
+
+ converter.setSourceFiles(srcs);
+ if (mapper == null)
+ converter.setDestinationDirectories(dests);
+ else
+ converter.setDestinationFiles(dests);
}
-
- // Convert List to array and return the array.
- return (String[])inputFiles.toArray(new String[0]);
}
/**
Index: contrib/rasterizertask/build.xml
===================================================================
--- contrib/rasterizertask/build.xml (revision 759159)
+++ contrib/rasterizertask/build.xml (working copy)
@@ -33,7 +33,14 @@