You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/01/06 03:14:56 UTC

cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java

donaldp     02/01/05 18:14:56

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
                        ANTLR.java
  Log:
  Use Execute2 abstraction
  
  Revision  Changes    Path
  1.16      +4 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  
  Index: ANTLR.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ANTLR.java	30 Dec 2001 10:46:58 -0000	1.15
  +++ ANTLR.java	6 Jan 2002 02:14:56 -0000	1.16
  @@ -15,8 +15,7 @@
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.ExecuteJava;
  -import org.apache.tools.ant.taskdefs.exec.Execute;
  -import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
  +import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  @@ -93,7 +92,7 @@
        */
       public Path createClasspath()
       {
  -        return commandline.createClasspath( getProject() ).createPath();
  +        return commandline.createClasspath().createPath();
       }
   
       /**
  @@ -223,9 +222,8 @@
       private int run( String[] command )
           throws TaskException
       {
  -        final Execute exe = new Execute();
  -        exe.setOutput( new LogOutputStream( getLogger(), false ) );
  -        exe.setError( new LogOutputStream( getLogger(), true ) );
  +        final Execute2 exe = new Execute2();
  +        setupLogger( exe );
   
           if( workingdir != null )
           {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>