diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index d18d54872..7a177474c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -289,6 +289,16 @@ public class Copy extends Task { return mapperElement; } + /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + createMapper().add(fileNameMapper); + } + + /** * Sets the character encoding * @param encoding the character encoding diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index f011430a5..06985a274 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -229,6 +229,16 @@ public class ExecuteOn extends ExecTask { return mapperElement; } + /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + createMapper().add(fileNameMapper); + } + + /** * @todo using taskName here is brittle, as a user could override it. * this should probably be modified to use the classname instead. diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 8dbdfbc3a..3e7f04255 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -336,6 +336,16 @@ public class Expand extends Task { return mapperElement; } + /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + createMapper().add(fileNameMapper); + } + + /** * Sets the encoding to assume for file names and comments. * diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index bc522fb44..f20bf86aa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java @@ -111,7 +111,7 @@ public class PathConvert extends Task { * Note that this value is case-insensitive when the build is * running on a Windows platform and case-sensitive when running on * a Unix platform. - * @param from + * @param from the prefix string to search for */ public void setFrom(String from) { this.from = from; @@ -169,13 +169,19 @@ public class PathConvert extends Task { * windows", "unix", "netware", and "os/2". */ public static class TargetOs extends EnumeratedAttribute { + /** + * @return the list of values for this enumerated attribute + */ public String[] getValues() { return new String[]{"windows", "unix", "netware", "os/2", "tandem"}; } } - /** Create a nested PATH element */ + /** + * Create a nested PATH element + * @return a Path to be used by ant reflection + */ public Path createPath() { if (isReference()) { @@ -223,6 +229,7 @@ public class PathConvert extends Task { * Set targetos to a platform to one of * "windows", "unix", "netware", or "os/2"; required unless * unless pathsep and/or dirsep are specified. + * @param target the target os * * @since Ant 1.5 */ @@ -254,6 +261,7 @@ public class PathConvert extends Task { /** * The property into which the converted path will be placed. + * @param p the property name */ public void setProperty(String p) { property = p; @@ -263,6 +271,7 @@ public class PathConvert extends Task { /** * Adds a reference to a Path, FileSet, DirSet, or FileList defined * elsewhere. + * @param r the reference to a path, fileset, dirset or filelist */ public void setRefid(Reference r) { if (path != null) { @@ -465,6 +474,18 @@ public class PathConvert extends Task { this.mapper = mapper; } + /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + Mapper m = new Mapper(getProject()); + m.add(fileNameMapper); + addMapper(m); + } + + /** * Validate that all our parameters have been properly initialized. * diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 88f3a8e8e..90c559e6c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -116,6 +116,15 @@ public class UpToDate extends Task implements Condition { return mapperElement; } + /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + createMapper().add(fileNameMapper); + } + /** * Evaluate (all) target and source file(s) to * see if the target(s) is/are up-to-date. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java index c68ddf568..0f5d40c0a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -110,6 +110,16 @@ public class Native2Ascii extends MatchingTask { return mapper; } + /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + createMapper().add(fileNameMapper); + } + + /** * Execute the task *