Return-Path: <conor@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 73445 invoked by uid 500); 12 Sep 2000 12:26:58 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 73423 invoked by uid 1142); 12 Sep 2000 12:26:53 -0000
Date: 12 Sep 2000 12:26:52 -0000
Message-ID: <20000912122652.73420.qmail@locus.apache.org>
From: conor@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Java.java

conor       00/09/12 05:26:48

  Modified:    src/main/org/apache/tools/ant/types Commandline.java
                        CommandlineJava.java
               src/main/org/apache/tools/ant/taskdefs Java.java
  Log:
  Allow commands to be reused by clearing their arguments
  
  Revision  Changes    Path
  1.11      +7 -0      jakarta-ant/src/main/org/apache/tools/ant/types/Commandline.java
  
  Index: Commandline.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Commandline.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Commandline.java	2000/09/04 15:19:17	1.10
  +++ Commandline.java	2000/09/12 12:26:41	1.11
  @@ -335,4 +335,11 @@
           arguments.removeAllElements();
       }
   
  +    /**
  +     * Clear out the arguments but leave the executable in place for another operation.
  +     */
  +    public void clearArgs() {
  +        arguments.removeAllElements();
  +    }
  +        
   }
  
  
  
  1.5       +7 -0      jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CommandlineJava.java	2000/08/09 06:20:30	1.4
  +++ CommandlineJava.java	2000/09/12 12:26:42	1.5
  @@ -160,4 +160,11 @@
           c.vmVersion = vmVersion;
           return c;
       }
  +
  +    /**
  +     * Clear out the java arguments.
  +     */
  +    public void clearJavaArgs() {
  +        javaCommand.clearArgs();
  +    }
   }
  
  
  
  1.20      +8 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Java.java	2000/09/06 14:04:58	1.19
  +++ Java.java	2000/09/12 12:26:46	1.20
  @@ -243,6 +243,8 @@
           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 @@
           run(cmdj);
       }
   
  +    /**
  +     * Clear out the arguments to this java task.
  +     */
  +    public void clearArgs() {
  +        cmdl.clearJavaArgs();
  +    }
   }