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:18:53 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka CovMerge.java
donaldp 02/01/05 18:18:53
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovMerge.java
Log:
Use Execute2 abstraction
Revision Changes Path
1.13 +4 -8 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CovMerge.java 1 Jan 2002 09:13:46 -0000 1.12
+++ CovMerge.java 6 Jan 2002 02:18:53 -0000 1.13
@@ -16,8 +16,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
-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.Commandline;
import org.apache.tools.ant.types.FileSet;
@@ -114,9 +113,8 @@
}
cmdl.createArgument().setValue( "-jp_paramfile=" + paramfile.getAbsolutePath() );
- final Execute exe = new Execute();
- exe.setOutput( new LogOutputStream( getLogger(), false ) );
- exe.setError( new LogOutputStream( getLogger(), true ) );
+ final Execute2 exe = new Execute2();
+ setupLogger( exe );
getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl.getCommandline() );
@@ -164,9 +162,7 @@
}
}
- File[] files = new File[ v.size() ];
- v.copyInto( files );
- return files;
+ return (File[])v.toArray( new File[ v.size() ] );
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>