donaldp     02/01/05 18:25:11

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
                        CCCheckin.java CCCheckout.java CCUnCheckout.java
                        CCUpdate.java
  Log:
  Removed unused variables and cleaned up tasks a little.
  
  Revision  Changes    Path
  1.6       +3 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
  
  Index: CCCheckin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CCCheckin.java	23 Dec 2001 06:31:55 -0000	1.5
  +++ CCCheckin.java	6 Jan 2002 02:25:11 -0000	1.6
  @@ -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 @@
           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 @@
   
           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 );
           }
       }
   
  
  
  
  1.6       +3 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
  
  Index: CCCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CCCheckout.java	23 Dec 2001 06:31:55 -0000	1.5
  +++ CCCheckout.java	6 Jan 2002 02:25:11 -0000	1.6
  @@ -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 @@
           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 @@
   
           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 );
           }
       }
   
  
  
  
  1.6       +3 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
  
  Index: CCUnCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CCUnCheckout.java	23 Dec 2001 06:31:55 -0000	1.5
  +++ CCUnCheckout.java	6 Jan 2002 02:25:11 -0000	1.6
  @@ -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 @@
           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 @@
   
           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 );
           }
       }
   
  
  
  
  1.6       +3 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
  
  Index: CCUpdate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CCUpdate.java	23 Dec 2001 06:31:55 -0000	1.5
  +++ CCUpdate.java	6 Jan 2002 02:25:11 -0000	1.6
  @@ -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 @@
           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 @@
           // 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 );
           }
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>