From 59c71517754bf84d5faa060f8857c4642c40ae91 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sat, 12 Jan 2002 23:57:41 +0000
Subject: [PATCH] Starting to clean this adaptor

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270714 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/types/CommandlineJava.java   | 15 +++++----------
 .../apache/tools/ant/types/CommandlineJava.java   | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 6cec58f12..7e000082f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -9,6 +9,7 @@ package org.apache.tools.ant.types;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.aut.nativelib.Os;
+import org.apache.avalon.excalibur.util.StringUtil;
 import java.io.File;
 
 /**
@@ -178,14 +179,6 @@ public class CommandlineJava
         sysProperties.addVariable( sysp );
     }
 
-    /**
-     * Clear out the java arguments.
-     */
-    public void clearJavaArgs()
-    {
-        javaCommand.clearArgs();
-    }
-
     public Argument createArgument()
     {
         return javaCommand.createArgument();
@@ -239,7 +232,8 @@ public class CommandlineJava
     {
         try
         {
-            return Commandline.toString( getCommandline() );
+            String[] line = getCommandline();
+            return StringUtil.join( line, " " );
         }
         catch( TaskException e )
         {
@@ -249,7 +243,8 @@ public class CommandlineJava
 
     private Commandline getActualVMCommand()
     {
-        Commandline actualVMCommand = (Commandline)vmCommand.clone();
+        Commandline actualVMCommand = new Commandline();
+        //(Commandline)vmCommand.clone();
         if( maxMemory != null )
         {
             actualVMCommand.createArgument().setValue( "-Xmx" + maxMemory );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java
index 6cec58f12..7e000082f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java
@@ -9,6 +9,7 @@ package org.apache.tools.ant.types;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.aut.nativelib.Os;
+import org.apache.avalon.excalibur.util.StringUtil;
 import java.io.File;
 
 /**
@@ -178,14 +179,6 @@ public class CommandlineJava
         sysProperties.addVariable( sysp );
     }
 
-    /**
-     * Clear out the java arguments.
-     */
-    public void clearJavaArgs()
-    {
-        javaCommand.clearArgs();
-    }
-
     public Argument createArgument()
     {
         return javaCommand.createArgument();
@@ -239,7 +232,8 @@ public class CommandlineJava
     {
         try
         {
-            return Commandline.toString( getCommandline() );
+            String[] line = getCommandline();
+            return StringUtil.join( line, " " );
         }
         catch( TaskException e )
         {
@@ -249,7 +243,8 @@ public class CommandlineJava
 
     private Commandline getActualVMCommand()
     {
-        Commandline actualVMCommand = (Commandline)vmCommand.clone();
+        Commandline actualVMCommand = new Commandline();
+        //(Commandline)vmCommand.clone();
         if( maxMemory != null )
         {
             actualVMCommand.createArgument().setValue( "-Xmx" + maxMemory );