git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270587 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -325,8 +324,6 @@ public class CCCheckin extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -342,11 +339,11 @@ public class CCCheckin extends ClearCase | |||||
| checkOptions( commandLine ); | checkOptions( commandLine ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -413,8 +412,6 @@ public class CCCheckout extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -430,11 +427,11 @@ public class CCCheckout extends ClearCase | |||||
| checkOptions( commandLine ); | checkOptions( commandLine ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -117,8 +116,6 @@ public class CCUnCheckout extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -134,11 +131,11 @@ public class CCUnCheckout extends ClearCase | |||||
| checkOptions( commandLine ); | checkOptions( commandLine ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -326,8 +325,6 @@ public class CCUpdate extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -347,11 +344,11 @@ public class CCUpdate extends ClearCase | |||||
| // For debugging | // For debugging | ||||
| System.out.println( commandLine.toString() ); | System.out.println( commandLine.toString() ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -325,8 +324,6 @@ public class CCCheckin extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -342,11 +339,11 @@ public class CCCheckin extends ClearCase | |||||
| checkOptions( commandLine ); | checkOptions( commandLine ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -413,8 +412,6 @@ public class CCCheckout extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -430,11 +427,11 @@ public class CCCheckout extends ClearCase | |||||
| checkOptions( commandLine ); | checkOptions( commandLine ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -117,8 +116,6 @@ public class CCUnCheckout extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -134,11 +131,11 @@ public class CCUnCheckout extends ClearCase | |||||
| checkOptions( commandLine ); | checkOptions( commandLine ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.clearcase; | package org.apache.tools.ant.taskdefs.optional.clearcase; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| /** | /** | ||||
| @@ -326,8 +325,6 @@ public class CCUpdate extends ClearCase | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| Commandline commandLine = new Commandline(); | Commandline commandLine = new Commandline(); | ||||
| Project aProj = getProject(); | |||||
| int result = 0; | |||||
| // Default the viewpath to basedir if it is not specified | // Default the viewpath to basedir if it is not specified | ||||
| if( getViewPath() == null ) | if( getViewPath() == null ) | ||||
| @@ -347,11 +344,11 @@ public class CCUpdate extends ClearCase | |||||
| // For debugging | // For debugging | ||||
| System.out.println( commandLine.toString() ); | System.out.println( commandLine.toString() ); | ||||
| result = run( commandLine ); | |||||
| final int result = run( commandLine ); | |||||
| if( result != 0 ) | if( result != 0 ) | ||||
| { | { | ||||
| String msg = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( msg ); | |||||
| final String message = "Failed executing: " + commandLine.toString(); | |||||
| throw new TaskException( message ); | |||||
| } | } | ||||
| } | } | ||||