From 02bf23c4632bf907d6212f5d7766e3f968fc45e3 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Tue, 12 Sep 2000 12:26:46 +0000 Subject: [PATCH] Allow commands to be reused by clearing their arguments git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267984 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Java.java | 8 ++++++++ src/main/org/apache/tools/ant/types/Commandline.java | 7 +++++++ src/main/org/apache/tools/ant/types/CommandlineJava.java | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index f7474aa9b..f3289d40e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -243,6 +243,8 @@ public class Java extends Task { Execute exe = new Execute(new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN), null); + + exe.setAntRun(project); if (dir == null) dir = project.getBaseDir(); @@ -269,4 +271,10 @@ public class Java extends Task { run(cmdj); } + /** + * Clear out the arguments to this java task. + */ + public void clearArgs() { + cmdl.clearJavaArgs(); + } } diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index 0996b33f1..a98f35bfc 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/src/main/org/apache/tools/ant/types/Commandline.java @@ -335,4 +335,11 @@ public class Commandline implements Cloneable { arguments.removeAllElements(); } + /** + * Clear out the arguments but leave the executable in place for another operation. + */ + public void clearArgs() { + arguments.removeAllElements(); + } + } diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java index 6df59af97..3b5e11d2f 100644 --- a/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -160,4 +160,11 @@ public class CommandlineJava implements Cloneable { c.vmVersion = vmVersion; return c; } + + /** + * Clear out the java arguments. + */ + public void clearJavaArgs() { + javaCommand.clearArgs(); + } }