From c66f11924c906857ff2c86f4586a6e2e359ee812 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 6 Jan 2002 02:25:11 +0000 Subject: [PATCH] Removed unused variables and cleaned up tasks a little. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270587 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/clearcase/CCCheckin.java | 9 +++------ .../ant/taskdefs/optional/clearcase/CCCheckout.java | 9 +++------ .../ant/taskdefs/optional/clearcase/CCUnCheckout.java | 9 +++------ .../tools/ant/taskdefs/optional/clearcase/CCUpdate.java | 9 +++------ .../tools/ant/taskdefs/optional/clearcase/CCCheckin.java | 9 +++------ .../ant/taskdefs/optional/clearcase/CCCheckout.java | 9 +++------ .../ant/taskdefs/optional/clearcase/CCUnCheckout.java | 9 +++------ .../tools/ant/taskdefs/optional/clearcase/CCUpdate.java | 9 +++------ 8 files changed, 24 insertions(+), 48 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java index fca375800..332ef403e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -325,8 +324,6 @@ public class CCCheckin extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -342,11 +339,11 @@ public class CCCheckin extends ClearCase checkOptions( commandLine ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java index 45d22cca4..b985d57d1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -413,8 +412,6 @@ public class CCCheckout extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -430,11 +427,11 @@ public class CCCheckout extends ClearCase checkOptions( commandLine ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java index 9cb23d99f..1ea772b92 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -117,8 +116,6 @@ public class CCUnCheckout extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -134,11 +131,11 @@ public class CCUnCheckout extends ClearCase checkOptions( commandLine ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java index 67bcae5f2..f9a759e80 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -326,8 +325,6 @@ public class CCUpdate extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -347,11 +344,11 @@ public class CCUpdate extends ClearCase // For debugging System.out.println( commandLine.toString() ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java index fca375800..332ef403e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -325,8 +324,6 @@ public class CCCheckin extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -342,11 +339,11 @@ public class CCCheckin extends ClearCase checkOptions( commandLine ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java index 45d22cca4..b985d57d1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -413,8 +412,6 @@ public class CCCheckout extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -430,11 +427,11 @@ public class CCCheckout extends ClearCase checkOptions( commandLine ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java index 9cb23d99f..1ea772b92 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -117,8 +116,6 @@ public class CCUnCheckout extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -134,11 +131,11 @@ public class CCUnCheckout extends ClearCase checkOptions( commandLine ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java index 67bcae5f2..f9a759e80 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; /** @@ -326,8 +325,6 @@ public class CCUpdate extends ClearCase throws TaskException { Commandline commandLine = new Commandline(); - Project aProj = getProject(); - int result = 0; // Default the viewpath to basedir if it is not specified if( getViewPath() == null ) @@ -347,11 +344,11 @@ public class CCUpdate extends ClearCase // For debugging System.out.println( commandLine.toString() ); - result = run( commandLine ); + final int result = run( commandLine ); if( result != 0 ) { - String msg = "Failed executing: " + commandLine.toString(); - throw new TaskException( msg ); + final String message = "Failed executing: " + commandLine.toString(); + throw new TaskException( message ); } }