donaldp 01/12/22 15:35:29
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Java.java Patch.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec
Execute.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
ANTLR.java Rpm.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
NetCommand.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Base.java
Log:
Made classes use the appropriate execute constructor
Revision Changes Path
1.12 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Java.java 2001/12/22 22:01:57 1.11
+++ Java.java 2001/12/22 23:35:28 1.12
@@ -378,13 +378,12 @@
if( out == null )
{
exe = new Execute( new LogStreamHandler( this,
Project.MSG_INFO,
- Project.MSG_WARN ),
- null );
+ Project.MSG_WARN )
);
}
else
{
fos = new FileOutputStream( out );
- exe = new Execute( new PumpStreamHandler( fos ), null );
+ exe = new Execute( new PumpStreamHandler( fos ) );
}
if( dir == null )
1.6 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java
Index: Patch.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Patch.java 2001/12/17 09:50:11 1.5
+++ Patch.java 2001/12/22 23:35:29 1.6
@@ -143,8 +143,7 @@
}
Execute exe = new Execute( new LogStreamHandler( this,
Project.MSG_INFO,
- Project.MSG_WARN ),
- null );
+ Project.MSG_WARN )
);
exe.setCommandline( toExecute.getCommandline() );
try
{
1.13 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java
Index: Execute.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Execute.java 2001/12/22 22:59:40 1.12
+++ Execute.java 2001/12/22 23:35:29 1.13
@@ -140,7 +140,7 @@
*/
public Execute()
{
- this( new PumpStreamHandler(), null );
+ this( new PumpStreamHandler() );
}
/**
@@ -149,7 +149,7 @@
* @param streamHandler the stream handler used to handle the input and
* output streams of the subprocess.
*/
- public Execute( ExecuteStreamHandler streamHandler )
+ public Execute( final ExecuteStreamHandler streamHandler )
{
this( streamHandler, null );
}
@@ -320,7 +320,7 @@
{
m_watchdog.checkException();
}
- return process.exitValue();;
+ return process.exitValue();
}
private CommandLauncher getLauncher()
1.10 +1 -1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ANTLR.java 2001/12/22 22:01:58 1.9
+++ ANTLR.java 2001/12/22 23:35:29 1.10
@@ -229,7 +229,7 @@
throws TaskException
{
Execute exe = new Execute( new LogStreamHandler( this,
Project.MSG_INFO,
- Project.MSG_WARN ),
null );
+ Project.MSG_WARN )
);
if( workingdir != null )
{
exe.setWorkingDirectory( workingdir );
1.10 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Index: Rpm.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Rpm.java 2001/12/22 12:57:36 1.9
+++ Rpm.java 2001/12/22 23:35:29 1.10
@@ -187,7 +187,7 @@
streamhandler = new PumpStreamHandler( outputstream, errorstream
);
}
- Execute exe = new Execute( streamhandler, null );
+ Execute exe = new Execute( streamhandler );
if( topDir == null ) topDir = getBaseDirectory();
exe.setWorkingDirectory( topDir );
1.10 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
Index: NetCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NetCommand.java 2001/12/22 12:57:37 1.9
+++ NetCommand.java 2001/12/22 23:35:29 1.10
@@ -203,7 +203,7 @@
File dir = _owner.getBaseDirectory();
ExecuteStreamHandler handler = new LogStreamHandler( _owner,
Project.MSG_INFO, Project.MSG_WARN );
- _exe = new Execute( handler, null );
+ _exe = new Execute( handler );
_exe.setWorkingDirectory( dir );
}
}//class
1.10 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JJTree.java 2001/12/22 22:01:58 1.9
+++ JJTree.java 2001/12/22 23:35:29 1.10
@@ -188,8 +188,7 @@
final Execute process =
new Execute( new LogStreamHandler( this,
Project.MSG_INFO,
- Project.MSG_INFO ),
- null );
+ Project.MSG_INFO ) );
log( cmdl.toString(), Project.MSG_VERBOSE );
process.setCommandline( cmdl.getCommandline() );
1.9 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- P4Base.java 2001/12/22 12:57:38 1.8
+++ P4Base.java 2001/12/22 23:35:29 1.9
@@ -165,8 +165,7 @@
if( handler == null )
handler = new SimpleP4OutputHandler( this );
- Execute exe = new Execute( handler, null );
-
+ final Execute exe = new Execute( handler );
exe.setCommandline( commandline.getCommandline() );
try
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
