From 4ed0da61ddfd8f936f21f9b3fbac6fd4b407978d Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sat, 22 Dec 2001 23:35:29 +0000
Subject: [PATCH] Made classes use the appropriate execute constructor

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270332 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/org/apache/tools/ant/taskdefs/Java.java        | 5 ++---
 .../src/main/org/apache/tools/ant/taskdefs/Patch.java       | 3 +--
 .../main/org/apache/tools/ant/taskdefs/exec/Execute.java    | 6 +++---
 .../main/org/apache/tools/ant/taskdefs/optional/ANTLR.java  | 2 +-
 .../main/org/apache/tools/ant/taskdefs/optional/Rpm.java    | 2 +-
 .../tools/ant/taskdefs/optional/dotnet/NetCommand.java      | 2 +-
 .../apache/tools/ant/taskdefs/optional/javacc/JJTree.java   | 3 +--
 .../apache/tools/ant/taskdefs/optional/perforce/P4Base.java | 3 +--
 .../src/todo/org/apache/tools/ant/taskdefs/Java.java        | 5 ++---
 .../src/todo/org/apache/tools/ant/taskdefs/Patch.java       | 3 +--
 .../todo/org/apache/tools/ant/taskdefs/exec/Execute.java    | 6 +++---
 .../todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java  | 2 +-
 .../todo/org/apache/tools/ant/taskdefs/optional/Rpm.java    | 2 +-
 .../tools/ant/taskdefs/optional/dotnet/NetCommand.java      | 2 +-
 .../apache/tools/ant/taskdefs/optional/javacc/JJTree.java   | 3 +--
 .../apache/tools/ant/taskdefs/optional/perforce/P4Base.java | 3 +--
 16 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
index 7b3f2e36b..c5956d101 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -378,13 +378,12 @@ public class Java extends Task
             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 )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java
index 89ee76d46..d67b99d5c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java
@@ -143,8 +143,7 @@ public class Patch extends Task
         }
 
         Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
-                                                         Project.MSG_WARN ),
-                                   null );
+                                                         Project.MSG_WARN ) );
         exe.setCommandline( toExecute.getCommandline() );
         try
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java
index 2248fb772..920e1f692 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java
@@ -140,7 +140,7 @@ public class Execute
      */
     public Execute()
     {
-        this( new PumpStreamHandler(), null );
+        this( new PumpStreamHandler() );
     }
 
     /**
@@ -149,7 +149,7 @@ public class Execute
      * @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 @@ public class Execute
         {
             m_watchdog.checkException();
         }
-        return process.exitValue();;
+        return process.exitValue();
     }
 
     private CommandLauncher getLauncher()
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index ecb7cf222..3b7b37bfa 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -229,7 +229,7 @@ public class ANTLR extends Task
         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 );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
index e8a630dbf..3a5cca2a4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
@@ -187,7 +187,7 @@ public class Rpm extends Task
             streamhandler = new PumpStreamHandler( outputstream, errorstream );
         }
 
-        Execute exe = new Execute( streamhandler, null );
+        Execute exe = new Execute( streamhandler );
 
         if( topDir == null ) topDir = getBaseDirectory();
         exe.setWorkingDirectory( topDir );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
index a3d5fe9e7..7f7805e01 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
@@ -203,7 +203,7 @@ public class NetCommand
         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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index 3dac2cd0b..988d1a94b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -188,8 +188,7 @@ public class JJTree extends Task
         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() );
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index d5530cf9b..e573ec2a8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -165,8 +165,7 @@ public abstract class P4Base extends org.apache.tools.ant.Task
             if( handler == null )
                 handler = new SimpleP4OutputHandler( this );
 
-            Execute exe = new Execute( handler, null );
-
+            final Execute exe = new Execute( handler );
             exe.setCommandline( commandline.getCommandline() );
 
             try
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java
index 7b3f2e36b..c5956d101 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java
@@ -378,13 +378,12 @@ public class Java extends Task
             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 )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Patch.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Patch.java
index 89ee76d46..d67b99d5c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Patch.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Patch.java
@@ -143,8 +143,7 @@ public class Patch extends Task
         }
 
         Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
-                                                         Project.MSG_WARN ),
-                                   null );
+                                                         Project.MSG_WARN ) );
         exe.setCommandline( toExecute.getCommandline() );
         try
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java
index 2248fb772..920e1f692 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java
@@ -140,7 +140,7 @@ public class Execute
      */
     public Execute()
     {
-        this( new PumpStreamHandler(), null );
+        this( new PumpStreamHandler() );
     }
 
     /**
@@ -149,7 +149,7 @@ public class Execute
      * @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 @@ public class Execute
         {
             m_watchdog.checkException();
         }
-        return process.exitValue();;
+        return process.exitValue();
     }
 
     private CommandLauncher getLauncher()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index ecb7cf222..3b7b37bfa 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -229,7 +229,7 @@ public class ANTLR extends Task
         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 );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java
index e8a630dbf..3a5cca2a4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java
@@ -187,7 +187,7 @@ public class Rpm extends Task
             streamhandler = new PumpStreamHandler( outputstream, errorstream );
         }
 
-        Execute exe = new Execute( streamhandler, null );
+        Execute exe = new Execute( streamhandler );
 
         if( topDir == null ) topDir = getBaseDirectory();
         exe.setWorkingDirectory( topDir );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
index a3d5fe9e7..7f7805e01 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
@@ -203,7 +203,7 @@ public class NetCommand
         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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index 3dac2cd0b..988d1a94b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -188,8 +188,7 @@ public class JJTree extends Task
         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() );
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index d5530cf9b..e573ec2a8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -165,8 +165,7 @@ public abstract class P4Base extends org.apache.tools.ant.Task
             if( handler == null )
                 handler = new SimpleP4OutputHandler( this );
 
-            Execute exe = new Execute( handler, null );
-
+            final Execute exe = new Execute( handler );
             exe.setCommandline( commandline.getCommandline() );
 
             try