maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r369857 [2/6] - in /maven/scm/trunk: maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/ maven-scm-plugin/ maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ maven-scm-plugin/src/site/resources/css/ maven-scm-providers/...
Date Tue, 17 Jan 2006 18:13:50 GMT
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java Tue Jan 17 10:12:41 2006
@@ -34,10 +34,11 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseEditCommand
-        extends AbstractEditCommand
-        implements ClearCaseCommand
+    extends AbstractEditCommand
+    implements ClearCaseCommand
 {
-    protected ScmResult executeEditCommand( ScmProviderRepository repository, ScmFileSet fileSet ) throws ScmException
+    protected ScmResult executeEditCommand( ScmProviderRepository repository, ScmFileSet fileSet )
+        throws ScmException
     {
         getLogger().debug( "executing edit command..." );
         Commandline cl = createCommandLine( getLogger(), fileSet );
@@ -53,12 +54,12 @@
             getLogger().debug( "Executing: " + cl.getWorkingDirectory().getAbsolutePath() + ">>" + cl.toString() );
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
         }
-        catch (CommandLineException ex)
+        catch ( CommandLineException ex )
         {
             throw new ScmException( "Error while executing clearcase command.", ex );
         }
 
-        if (exitCode != 0)
+        if ( exitCode != 0 )
         {
             return new EditScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
         }
@@ -85,7 +86,7 @@
         command.createArgument().setValue( "-nc" );
 
         File[] files = scmFileSet.getFiles();
-        for (int i = 0; i < files.length; i++)
+        for ( int i = 0; i < files.length; i++ )
         {
             File file = files[i];
             logger.info( "Checking out file: " + file.getAbsolutePath() );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
 import java.util.ArrayList;
@@ -28,7 +28,7 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseEditConsumer
-        implements StreamConsumer
+    implements StreamConsumer
 {
     private ScmLogger logger;
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java Tue Jan 17 10:12:41 2006
@@ -35,10 +35,12 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseRemoveCommand
-        extends AbstractRemoveCommand
-        implements ClearCaseCommand
+    extends AbstractRemoveCommand
+    implements ClearCaseCommand
 {
-    protected ScmResult executeRemoveCommand( ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet, String string ) throws ScmException
+    protected ScmResult executeRemoveCommand( ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet,
+                                              String string )
+        throws ScmException
     {
         getLogger().debug( "executing remove command..." );
         Commandline cl = createCommandLine( getLogger(), scmFileSet );
@@ -51,31 +53,39 @@
         try
         {
             // First we need to 'check out' the current directory
-            Commandline checkoutCurrentDirCommandLine = ClearCaseEditCommand.createCheckoutCurrentDirCommandLine( scmFileSet );
-            getLogger().debug( "Executing: " + checkoutCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" + checkoutCurrentDirCommandLine.toString() );
-            exitCode = CommandLineUtils.executeCommandLine( checkoutCurrentDirCommandLine, new CommandLineUtils.StringStreamConsumer(), stderr );
+            Commandline checkoutCurrentDirCommandLine =
+                ClearCaseEditCommand.createCheckoutCurrentDirCommandLine( scmFileSet );
+            getLogger().debug( "Executing: " + checkoutCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() +
+                ">>" + checkoutCurrentDirCommandLine.toString() );
+            exitCode = CommandLineUtils.executeCommandLine( checkoutCurrentDirCommandLine,
+                                                            new CommandLineUtils.StringStreamConsumer(), stderr );
 
-            if (exitCode == 0)
+            if ( exitCode == 0 )
             {
                 // Then we add the file
                 getLogger().debug( "Executing: " + cl.getWorkingDirectory().getAbsolutePath() + ">>" + cl.toString() );
                 exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
 
-                if (exitCode == 0)
+                if ( exitCode == 0 )
                 {
                     // Then we check in the current directory again.
-                    Commandline checkinCurrentDirCommandLine = ClearCaseEditCommand.createCheckinCurrentDirCommandLine( scmFileSet );
-                    getLogger().debug( "Executing: " + checkinCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" + checkinCurrentDirCommandLine.toString() );
-                    exitCode = CommandLineUtils.executeCommandLine( checkinCurrentDirCommandLine, new CommandLineUtils.StringStreamConsumer(), stderr );
+                    Commandline checkinCurrentDirCommandLine =
+                        ClearCaseEditCommand.createCheckinCurrentDirCommandLine( scmFileSet );
+                    getLogger().debug( "Executing: " +
+                        checkinCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" +
+                        checkinCurrentDirCommandLine.toString() );
+                    exitCode = CommandLineUtils.executeCommandLine( checkinCurrentDirCommandLine,
+                                                                    new CommandLineUtils.StringStreamConsumer(),
+                                                                    stderr );
                 }
             }
         }
-        catch (CommandLineException ex)
+        catch ( CommandLineException ex )
         {
             throw new ScmException( "Error while executing clearcase command.", ex );
         }
 
-        if (exitCode != 0)
+        if ( exitCode != 0 )
         {
             return new StatusScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
         }
@@ -102,7 +112,7 @@
         command.createArgument().setValue( "-nc" );
 
         File[] files = scmFileSet.getFiles();
-        for (int i = 0; i < files.length; i++)
+        for ( int i = 0; i < files.length; i++ )
         {
             File file = files[i];
             logger.info( "Deleting file: " + file.getAbsolutePath() );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
 import java.util.ArrayList;
@@ -28,7 +28,7 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseRemoveConsumer
-        implements StreamConsumer
+    implements StreamConsumer
 {
     private ScmLogger logger;
 
@@ -52,7 +52,7 @@
         logger.debug( line );
         int beginIndex = line.indexOf( '"' );
         String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex + 1 ) );
-        removedFiles.add( new ScmFile( fileName, ScmFileStatus.DELETED ) );        
+        removedFiles.add( new ScmFile( fileName, ScmFileStatus.DELETED ) );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java Tue Jan 17 10:12:41 2006
@@ -30,14 +30,13 @@
 
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
- * @version
  */
 public class ClearCaseStatusCommand
     extends AbstractStatusCommand
     implements ClearCaseCommand
 {
-    protected StatusScmResult executeStatusCommand( ScmProviderRepository scmProviderRepository,
-                                                    ScmFileSet scmFileSet ) throws ScmException
+    protected StatusScmResult executeStatusCommand( ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet )
+        throws ScmException
     {
         getLogger().debug( "executing status command..." );
         Commandline cl = createCommandLine( scmFileSet );
@@ -83,7 +82,7 @@
         command.createArgument().setValue( "lscheckout" );
         command.createArgument().setValue( "-r" );
         command.createArgument().setValue( "-fmt" );
-        command.createArgument().setValue( "%n\\n");
+        command.createArgument().setValue( "%n\\n" );
 
         return command;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java Tue Jan 17 10:12:41 2006
@@ -21,15 +21,15 @@
 import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.io.File;
 
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseStatusConsumer
-        implements StreamConsumer
+    implements StreamConsumer
 {
     private ScmLogger logger;
 
@@ -54,7 +54,8 @@
     public void consumeLine( String line )
     {
         logger.debug( line );
-        checkedOutFiles.add( new ScmFile( workingDirectory.getAbsolutePath() + line.substring( 1 ), ScmFileStatus.CHECKED_OUT ) );
+        checkedOutFiles.add(
+            new ScmFile( workingDirectory.getAbsolutePath() + line.substring( 1 ), ScmFileStatus.CHECKED_OUT ) );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java Tue Jan 17 10:12:41 2006
@@ -34,13 +34,12 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseTagCommand
-        extends AbstractTagCommand
-        implements ClearCaseCommand
+    extends AbstractTagCommand
+    implements ClearCaseCommand
 {
 
-    protected ScmResult executeTagCommand( ScmProviderRepository scmProviderRepository,
-                                           ScmFileSet fileSet,
-                                           String tag ) throws ScmException
+    protected ScmResult executeTagCommand( ScmProviderRepository scmProviderRepository, ScmFileSet fileSet, String tag )
+        throws ScmException
     {
         getLogger().debug( "executing tag command..." );
         Commandline cl = createCommandLine( fileSet, tag );
@@ -55,16 +54,18 @@
         {
             getLogger().debug( "Creating label: " + tag );
             Commandline newLabelCommandLine = createNewLabelCommandLine( fileSet, tag );
-            getLogger().debug( "Executing: " + newLabelCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" + newLabelCommandLine.toString() );
-            exitCode = CommandLineUtils.executeCommandLine( newLabelCommandLine, new CommandLineUtils.StringStreamConsumer(), stderr );
+            getLogger().debug( "Executing: " + newLabelCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" +
+                newLabelCommandLine.toString() );
+            exitCode = CommandLineUtils.executeCommandLine( newLabelCommandLine,
+                                                            new CommandLineUtils.StringStreamConsumer(), stderr );
 
-            if (exitCode == 0)
+            if ( exitCode == 0 )
             {
                 getLogger().debug( "Executing: " + cl.getWorkingDirectory().getAbsolutePath() + ">>" + cl.toString() );
                 exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
             }
         }
-        catch (CommandLineException ex)
+        catch ( CommandLineException ex )
         {
             throw new ScmException( "Error while executing clearcase command.", ex );
         }
@@ -93,15 +94,15 @@
 
         command.createArgument().setValue( "mklabel" );
         File[] files = scmFileSet.getFiles();
-        if( files.length == 0 )
+        if ( files.length == 0 )
         {
             command.createArgument().setValue( "-recurse" );
         }
         command.createArgument().setValue( tag );
 
-        if( files.length > 0 )
+        if ( files.length > 0 )
         {
-            for (int i = 0; i < files.length; i++)
+            for ( int i = 0; i < files.length; i++ )
             {
                 File file = files[i];
                 command.createArgument().setValue( file.getName() );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
 import java.util.ArrayList;
@@ -26,7 +26,6 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version 
  */
 public class ClearCaseTagConsumer
     implements StreamConsumer

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java Tue Jan 17 10:12:41 2006
@@ -34,10 +34,11 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseUnEditCommand
-        extends AbstractUnEditCommand
-        implements ClearCaseCommand
+    extends AbstractUnEditCommand
+    implements ClearCaseCommand
 {
-    protected ScmResult executeUnEditCommand( ScmProviderRepository repository, ScmFileSet fileSet ) throws ScmException
+    protected ScmResult executeUnEditCommand( ScmProviderRepository repository, ScmFileSet fileSet )
+        throws ScmException
     {
         getLogger().debug( "executing unedit command..." );
         Commandline cl = createCommandLine( getLogger(), fileSet );
@@ -53,12 +54,12 @@
             getLogger().debug( "Executing: " + cl.getWorkingDirectory().getAbsolutePath() + ">>" + cl.toString() );
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
         }
-        catch (CommandLineException ex)
+        catch ( CommandLineException ex )
         {
             throw new ScmException( "Error while executing clearcase command.", ex );
         }
 
-        if (exitCode != 0)
+        if ( exitCode != 0 )
         {
             return new StatusScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
         }
@@ -84,7 +85,7 @@
         command.createArgument().setValue( "-keep" );
 
         File[] files = scmFileSet.getFiles();
-        for (int i = 0; i < files.length; i++)
+        for ( int i = 0; i < files.length; i++ )
         {
             File file = files[i];
             command.createArgument().setValue( file.getName() );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
 import java.util.ArrayList;
@@ -28,7 +28,7 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseUnEditConsumer
-        implements StreamConsumer
+    implements StreamConsumer
 {
     private ScmLogger logger;
 
@@ -50,7 +50,7 @@
     public void consumeLine( String line )
     {
         logger.debug( line );
-        if( line.indexOf( "Checkout cancelled" ) > -1 )
+        if ( line.indexOf( "Checkout cancelled" ) > -1 )
         {
             int beginIndex = line.indexOf( '"' );
             String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex + 1 ) );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java Tue Jan 17 10:12:41 2006
@@ -34,8 +34,8 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseUpdateCommand
-        extends AbstractUpdateCommand
-        implements ClearCaseCommand
+    extends AbstractUpdateCommand
+    implements ClearCaseCommand
 {
     protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repository, ScmFileSet fileSet, String tag )
         throws ScmException
@@ -54,12 +54,12 @@
             getLogger().debug( "Executing: " + cl.getWorkingDirectory().getAbsolutePath() + ">>" + cl.toString() );
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
         }
-        catch (CommandLineException ex)
+        catch ( CommandLineException ex )
         {
             throw new ScmException( "Error while executing clearcase command.", ex );
         }
 
-        if (exitCode != 0)
+        if ( exitCode != 0 )
         {
             return new UpdateScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
         }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
 import java.util.ArrayList;
@@ -28,7 +28,7 @@
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
 public class ClearCaseUpdateConsumer
-        implements StreamConsumer
+    implements StreamConsumer
 {
     private ScmLogger logger;
 
@@ -50,7 +50,7 @@
     public void consumeLine( String line )
     {
         logger.debug( line );
-        if( line.indexOf( "Loading" ) > -1 )
+        if ( line.indexOf( "Loading" ) > -1 )
         {
             int beginIndex = line.indexOf( '"' );
             String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex + 1 ) );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java Tue Jan 17 10:12:41 2006
@@ -25,7 +25,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseAddCommandTest extends ScmTestCase
+public class ClearCaseAddCommandTest
+    extends ScmTestCase
 {
     public void testAddCommand()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -30,9 +30,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseAddConsumerTest extends ScmTestCase
+public class ClearCaseAddConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/add/add.txt" );
 
@@ -42,7 +44,7 @@
 
         ClearCaseAddConsumer consumer = new ClearCaseAddConsumer( new DefaultLog() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -53,7 +55,7 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
         assertEquals( "test.java", scmFile.getPath() );
         assertEquals( ScmFileStatus.ADDED, scmFile.getStatus() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,12 +16,11 @@
  * limitations under the License.
  */
 
-import java.io.File;
-import java.util.Date;
-
 import org.apache.maven.scm.ScmTestCase;
-
 import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
+import java.util.Date;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
+import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.ScmException;
 import org.codehaus.plexus.util.cli.Commandline;
 
 import java.io.File;
@@ -26,7 +26,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseCheckInCommandTest extends ScmTestCase
+public class ClearCaseCheckInCommandTest
+    extends ScmTestCase
 {
     public void testCommand()
         throws ScmException

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -30,9 +30,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseCheckInConsumerTest extends ScmTestCase
+public class ClearCaseCheckInConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/checkin/checkin.txt" );
 
@@ -42,7 +44,7 @@
 
         ClearCaseCheckInConsumer consumer = new ClearCaseCheckInConsumer( new DefaultLog() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -53,7 +55,7 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
         assertEquals( "test.java", scmFile.getPath() );
         assertEquals( ScmFileStatus.CHECKED_IN, scmFile.getStatus() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java Tue Jan 17 10:12:41 2006
@@ -19,8 +19,8 @@
 import org.apache.maven.scm.ScmTestCase;
 import org.codehaus.plexus.util.cli.Commandline;
 
-import java.io.IOException;
 import java.io.File;
+import java.io.IOException;
 
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
@@ -31,14 +31,18 @@
     public void testCreateViewCommandLine()
         throws IOException
     {
-        Commandline commandLine = ClearCaseCheckOutCommand.createCreateViewCommandLine( getWorkingDirectory(), "testView" );
-        assertEquals( "cleartool mkview -snapshot -tag testView -vws " + ClearCaseCheckOutCommand.getViewStore() + "testView.vws " + getWorkingDirectory(), commandLine.toString() );
+        Commandline commandLine =
+            ClearCaseCheckOutCommand.createCreateViewCommandLine( getWorkingDirectory(), "testView" );
+        assertEquals( "cleartool mkview -snapshot -tag testView -vws " + ClearCaseCheckOutCommand.getViewStore() +
+            "testView.vws " + getWorkingDirectory(), commandLine.toString() );
     }
 
     public void testUpdateConfigSpec()
     {
         File configSpecLocation = new File( "\\\\myserver\\configspecs\\testconfigspec.txt" );
-        Commandline commandLine = ClearCaseCheckOutCommand.createUpdateConfigSpecCommandLine( getWorkingDirectory(), configSpecLocation, "testView" );
+        Commandline commandLine = ClearCaseCheckOutCommand.createUpdateConfigSpecCommandLine( getWorkingDirectory(),
+                                                                                              configSpecLocation,
+                                                                                              "testView" );
         assertEquals( "cleartool setcs -tag testView " + configSpecLocation, commandLine.toString() );
     }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java Tue Jan 17 10:12:41 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.log.DefaultLog;
 import org.codehaus.plexus.util.cli.Commandline;
 
@@ -26,7 +26,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseEditCommandTest extends ScmTestCase
+public class ClearCaseEditCommandTest
+    extends ScmTestCase
 {
     public void testCommand()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -30,9 +30,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseEditConsumerTest extends ScmTestCase
+public class ClearCaseEditConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/edit/edit.txt" );
 
@@ -42,7 +44,7 @@
 
         ClearCaseEditConsumer consumer = new ClearCaseEditConsumer( new DefaultLog() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -53,7 +55,7 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
         assertEquals( "test.java", scmFile.getPath() );
         assertEquals( ScmFileStatus.UNKNOWN, scmFile.getStatus() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java Tue Jan 17 10:12:41 2006
@@ -26,7 +26,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseRemoveCommandTest extends ScmTestCase
+public class ClearCaseRemoveCommandTest
+    extends ScmTestCase
 {
     public void testCommand()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -30,9 +30,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseRemoveConsumerTest extends ScmTestCase
+public class ClearCaseRemoveConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/remove/remove.txt" );
 
@@ -42,7 +44,7 @@
 
         ClearCaseRemoveConsumer consumer = new ClearCaseRemoveConsumer( new DefaultLog() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -53,7 +55,7 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
         assertEquals( "test.java", scmFile.getPath() );
         assertEquals( ScmFileStatus.DELETED, scmFile.getStatus() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java Tue Jan 17 10:12:41 2006
@@ -25,7 +25,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseStatusCommandTest extends ScmTestCase
+public class ClearCaseStatusCommandTest
+    extends ScmTestCase
 {
     public void testCommand()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -27,9 +27,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseStatusConsumerTest extends ScmTestCase
+public class ClearCaseStatusConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/status/status.txt" );
 
@@ -39,7 +41,7 @@
 
         ClearCaseStatusConsumer consumer = new ClearCaseStatusConsumer( new DefaultLog(), getWorkingDirectory() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -50,8 +52,8 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
-        assertEquals( new File( getWorkingDirectory(), "test.java").getAbsolutePath(), scmFile.getPath() );
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
+        assertEquals( new File( getWorkingDirectory(), "test.java" ).getAbsolutePath(), scmFile.getPath() );
         assertEquals( ScmFileStatus.CHECKED_OUT, scmFile.getStatus() );
     }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java Tue Jan 17 10:12:41 2006
@@ -25,7 +25,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseTagCommandTest extends ScmTestCase
+public class ClearCaseTagCommandTest
+    extends ScmTestCase
 {
     public void testCommand()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -27,9 +27,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseTagConsumerTest extends ScmTestCase
+public class ClearCaseTagConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/tag/tag.txt" );
 
@@ -39,7 +41,7 @@
 
         ClearCaseTagConsumer consumer = new ClearCaseTagConsumer( new DefaultLog() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -50,7 +52,7 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
         assertEquals( "test.java", scmFile.getPath() );
         assertEquals( ScmFileStatus.TAGGED, scmFile.getStatus() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java Tue Jan 17 10:12:41 2006
@@ -26,7 +26,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseUnEditCommandTest extends ScmTestCase
+public class ClearCaseUnEditCommandTest
+    extends ScmTestCase
 {
     public void testCommand()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -30,9 +30,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseUnEditConsumerTest extends ScmTestCase
+public class ClearCaseUnEditConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/unedit/unedit.txt" );
 
@@ -42,7 +44,7 @@
 
         ClearCaseUnEditConsumer consumer = new ClearCaseUnEditConsumer( new DefaultLog() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -53,7 +55,7 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
         assertEquals( "test.java", scmFile.getPath() );
         assertEquals( ScmFileStatus.UNKNOWN, scmFile.getStatus() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java Tue Jan 17 10:12:41 2006
@@ -23,7 +23,8 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseUpdateCommandTest extends ScmTestCase
+public class ClearCaseUpdateCommandTest
+    extends ScmTestCase
 {
     public void testCommand()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java Tue Jan 17 10:12:41 2006
@@ -30,9 +30,11 @@
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseUpdateConsumerTest extends ScmTestCase
+public class ClearCaseUpdateConsumerTest
+    extends ScmTestCase
 {
-    public void testConsumer() throws IOException
+    public void testConsumer()
+        throws IOException
     {
         InputStream inputStream = getResourceAsStream( "/clearcase/update/update.txt" );
 
@@ -42,7 +44,7 @@
 
         ClearCaseUpdateConsumer consumer = new ClearCaseUpdateConsumer( new DefaultLog() );
 
-        while (s != null)
+        while ( s != null )
         {
             consumer.consumeLine( s );
 
@@ -53,7 +55,7 @@
 
         assertEquals( "Wrong number of entries returned", 1, entries.size() );
 
-        ScmFile scmFile = (ScmFile)entries.iterator().next();
+        ScmFile scmFile = (ScmFile) entries.iterator().next();
         assertEquals( "my_vob\\modules\\utils\\utils-logging-jar\\testfile.txt", scmFile.getPath() );
         assertEquals( ScmFileStatus.UPDATED, scmFile.getStatus() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepositoryTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepositoryTest.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepositoryTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepositoryTest.java Tue Jan 17 10:12:41 2006
@@ -19,13 +19,14 @@
 import junit.framework.TestCase;
 import org.apache.maven.scm.repository.ScmRepositoryException;
 
-import java.io.IOException;
 import java.io.File;
+import java.io.IOException;
 
 /**
  * @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
  */
-public class ClearCaseScmProviderRepositoryTest extends TestCase
+public class ClearCaseScmProviderRepositoryTest
+    extends TestCase
 {
     public ClearCaseScmProviderRepositoryTest()
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java Tue Jan 17 10:12:41 2006
@@ -25,10 +25,10 @@
 import java.util.List;
 
 /**
- * @deprecated 
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
+ * @deprecated
  */
 public class AbstractCvsConsumer
     implements StreamConsumer

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java Tue Jan 17 10:12:41 2006
@@ -50,8 +50,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
@@ -185,8 +185,8 @@
             // use the local repository directory eg. '/home/cvspublic'
             cvsroot = tokens[1];
         }
-        else if ( transport.equalsIgnoreCase( TRANSPORT_PSERVER ) || transport.equalsIgnoreCase( TRANSPORT_LSERVER )
-                  || transport.equalsIgnoreCase( TRANSPORT_EXT ) )
+        else if ( transport.equalsIgnoreCase( TRANSPORT_PSERVER ) || transport.equalsIgnoreCase( TRANSPORT_LSERVER ) ||
+            transport.equalsIgnoreCase( TRANSPORT_EXT ) )
         {
             if ( tokens.length != 4 && transport.equalsIgnoreCase( TRANSPORT_EXT ) )
             {
@@ -335,7 +335,7 @@
                     {
                         port = new Integer( tokens[2] ).intValue();
                     }
-                    catch( Exception e )
+                    catch ( Exception e )
                     {
                         //incorrect
                         result.messages.add( "Your scm url is invalid." );
@@ -419,8 +419,8 @@
         }
         else
         {
-            result.repository = new CvsScmProviderRepository( cvsroot, transport, user, password, host, port, path,
-                                                              module );
+            result.repository =
+                new CvsScmProviderRepository( cvsroot, transport, user, password, host, port, path, module );
         }
 
         return result;
@@ -432,8 +432,8 @@
     public AddScmResult add( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsAddCommand command = new CvsAddCommand();
 
         command.setLogger( getLogger() );
@@ -447,8 +447,8 @@
     public ChangeLogScmResult changelog( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsChangeLogCommand command = new CvsChangeLogCommand();
 
         command.setLogger( getLogger() );
@@ -462,8 +462,8 @@
     public CheckInScmResult checkin( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsCheckInCommand command = new CvsCheckInCommand();
 
         command.setLogger( getLogger() );
@@ -477,8 +477,8 @@
     public CheckOutScmResult checkout( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsCheckOutCommand command = new CvsCheckOutCommand();
 
         command.setLogger( getLogger() );
@@ -492,8 +492,8 @@
     public DiffScmResult diff( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsDiffCommand command = new CvsDiffCommand();
 
         command.setLogger( getLogger() );
@@ -507,8 +507,8 @@
     public LoginScmResult login( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsLoginCommand command = new CvsLoginCommand();
 
         command.setLogger( getLogger() );
@@ -522,9 +522,9 @@
     public RemoveScmResult remove( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsRemoveCommand command = new CvsRemoveCommand();
 
         command.setLogger( getLogger() );
@@ -538,8 +538,8 @@
     public StatusScmResult status( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsStatusCommand command = new CvsStatusCommand();
 
         command.setLogger( getLogger() );
@@ -553,9 +553,9 @@
     public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsTagCommand command = new CvsTagCommand();
 
         command.setLogger( getLogger() );
@@ -569,18 +569,19 @@
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
-        fileSet = fixUpScmFileSetAbsoluteFilePath ( fileSet );
-        
+        fileSet = fixUpScmFileSetAbsoluteFilePath( fileSet );
+
         CvsUpdateCommand command = new CvsUpdateCommand();
 
         command.setLogger( getLogger() );
 
         return (UpdateScmResult) command.execute( repository.getProviderRepository(), fileSet, parameters );
     }
-    
+
     /**
      * CVS provider requires that all files in ScmFileSet must be relative to basedir
      * This function ensures and converts all absolute paths to relative paths
+     *
      * @param currentFileSet
      * @return
      * @throws ScmException
@@ -589,53 +590,53 @@
         throws ScmException
     {
         ScmFileSet newFileSet = null;
-        try 
+        try
         {
             File basedir = getAbsoluteFilePath( currentFileSet.getBasedir() );
-        
+
             File [] files = currentFileSet.getFiles();
-        
-            for ( int i = 0 ; i < files.length; ++i )
+
+            for ( int i = 0; i < files.length; ++i )
             {
                 if ( files[i].isAbsolute() )
                 {
                     files[i] = new File( getRelativePath( basedir, files[i] ) );
                 }
             }
-            
+
             newFileSet = new ScmFileSet( basedir, files );
         }
         catch ( IOException e )
         {
-            throw new ScmException ( "Invalid file set.", e );
+            throw new ScmException( "Invalid file set.", e );
         }
-        
+
         return newFileSet;
     }
-    
+
     public static String getRelativePath( File basedir, File f )
         throws ScmException, IOException
     {
         File fileOrDir = getAbsoluteFilePath( f );
-        
+
         if ( !fileOrDir.getPath().startsWith( basedir.getPath() ) )
         {
-            throw new ScmException ( fileOrDir.getPath() + " was not contained in " + basedir.getPath() );
+            throw new ScmException( fileOrDir.getPath() + " was not contained in " + basedir.getPath() );
         }
-            
+
         return fileOrDir.getPath().substring( basedir.getPath().length() + 1, fileOrDir.getPath().length() );
     }
-    
+
     private static File getAbsoluteFilePath( File fileOrDir )
-        throws IOException 
+        throws IOException
     {
-        String javaPathString = fileOrDir.getCanonicalPath().replace( '\\', '/' ) ;
-        
-        if ( javaPathString.endsWith("/") )
+        String javaPathString = fileOrDir.getCanonicalPath().replace( '\\', '/' );
+
+        if ( javaPathString.endsWith( "/" ) )
         {
             javaPathString = javaPathString.substring( 0, javaPathString.length() - 1 );
         }
 
-        return new File ( javaPathString );
-    }    
+        return new File( javaPathString );
+    }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java Tue Jan 17 10:12:41 2006
@@ -39,7 +39,9 @@
  * @version $Id$
  * @todo separate the CVSlib stuff from the cvs command line so it is clear what needs to be updated eventually
  */
-public class CvsAddCommand extends AbstractAddCommand implements CvsCommand
+public class CvsAddCommand
+    extends AbstractAddCommand
+    implements CvsCommand
 {
     protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
                                            boolean binary )
@@ -92,7 +94,7 @@
 
         getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
         getLogger().debug( "Command line: " + cl );
-        
+
         try
         {
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java Tue Jan 17 10:12:41 2006
@@ -35,7 +35,9 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
-public class CvsChangeLogCommand extends AbstractChangeLogCommand implements CvsCommand
+public class CvsChangeLogCommand
+    extends AbstractChangeLogCommand
+    implements CvsCommand
 {
     protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
                                                           Date startDate, Date endDate, int numDays, String branch )
@@ -102,7 +104,7 @@
 
         getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
         getLogger().debug( "Command line: " + cl );
-        
+
         try
         {
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java Tue Jan 17 10:12:41 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.ChangeSet;
 import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
 import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
@@ -36,41 +36,66 @@
     private List entries = new ArrayList();
 
     // state machine constants for reading cvs output
-    /** expecting file information */
+
+    /**
+     * expecting file information
+     */
     private static final int GET_FILE = 1;
 
-    /** expecting date */
+    /**
+     * expecting date
+     */
     private static final int GET_DATE = 2;
 
-    /** expecting comments */
+    /**
+     * expecting comments
+     */
     private static final int GET_COMMENT = 3;
 
-    /** expecting revision */
+    /**
+     * expecting revision
+     */
     private static final int GET_REVISION = 4;
 
-    /** Marks start of file data */
+    /**
+     * Marks start of file data
+     */
     private static final String START_FILE = "Working file: ";
 
-    /** Marks end of file */
-    private static final String END_FILE = "==================================="
-                                           + "==========================================";
-
-    /** Marks start of revision */
+    /**
+     * Marks end of file
+     */
+    private static final String END_FILE =
+        "===================================" + "==========================================";
+
+    /**
+     * Marks start of revision
+     */
     private static final String START_REVISION = "----------------------------";
 
-    /** Marks revision data */
+    /**
+     * Marks revision data
+     */
     private static final String REVISION_TAG = "revision ";
 
-    /** Marks date data */
+    /**
+     * Marks date data
+     */
     private static final String DATE_TAG = "date: ";
 
-    /** current status of the parser */
+    /**
+     * current status of the parser
+     */
     private int status = GET_FILE;
 
-    /** the current log entry being processed by the parser */
+    /**
+     * the current log entry being processed by the parser
+     */
     private ChangeSet currentChange = null;
 
-    /** the current file being processed by the parser */
+    /**
+     * the current file being processed by the parser
+     */
     private ChangeFile currentFile = null;
 
     private ScmLogger logger;

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java Tue Jan 17 10:12:41 2006
@@ -37,7 +37,9 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
-public class CvsCheckInCommand extends AbstractCheckInCommand implements CvsCommand
+public class CvsCheckInCommand
+    extends AbstractCheckInCommand
+    implements CvsCommand
 {
     protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
                                                       String tag )
@@ -99,7 +101,7 @@
 
         getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
         getLogger().debug( "Command line: " + cl );
-        
+
         try
         {
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java Tue Jan 17 10:12:41 2006
@@ -32,7 +32,9 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
-public class CvsCheckOutCommand extends AbstractCheckOutCommand implements CvsCommand
+public class CvsCheckOutCommand
+    extends AbstractCheckOutCommand
+    implements CvsCommand
 {
     protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag )
         throws ScmException

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffCommand.java Tue Jan 17 10:12:41 2006
@@ -53,7 +53,7 @@
 
         getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
         getLogger().debug( "Command line: " + cl );
-        
+
         try
         {
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
@@ -69,7 +69,8 @@
 //            return new DiffScmResult( cl.toString(), "The cvs command failed.", stderr.getOutput(), false );
 //        }
 
-        return new DiffScmResult( cl.toString(), consumer.getChangedFiles(), consumer.getDifferences(), consumer.getPatch() );
+        return new DiffScmResult( cl.toString(), consumer.getChangedFiles(), consumer.getDifferences(),
+                                  consumer.getPatch() );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java Tue Jan 17 10:12:41 2006
@@ -146,9 +146,9 @@
         {
             // skip, though could parse to verify command
         }
-        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
-            || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN )
-            || line.equals( NO_NEWLINE_TOKEN ) )
+        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) ||
+            line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN ) ||
+            line.equals( NO_NEWLINE_TOKEN ) )
         {
             // add to buffer
             currentDifference.append( line ).append( "\n" );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java Tue Jan 17 10:12:41 2006
@@ -35,52 +35,53 @@
  */
 public class CvsPass
 {
-    /** CVS Root */
+    /**
+     * CVS Root
+     */
     private String cvsRoot = null;
 
-    /** Password file to add password to */
+    /**
+     * Password file to add password to
+     */
     private File passFile = null;
 
-    /** Password to add to file */
+    /**
+     * Password to add to file
+     */
     private String password = null;
-    
+
     private ScmLogger logger;
 
-    /** Array contain char conversion data */
-    private final char[] shifts = {
-        0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-       16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-      114, 120,  53,  79,  96, 109,  72, 108,  70,  64,  76,  67, 116,  74,  68,  87,
-      111,  52,  75, 119,  49,  34,  82,  81,  95,  65, 112,  86, 118, 110, 122, 105,
-       41,  57,  83,  43,  46, 102,  40,  89,  38, 103,  45,  50,  42, 123,  91,  35,
-      125,  55,  54,  66, 124, 126,  59,  47,  92,  71, 115,  78,  88, 107, 106,  56,
-       36, 121, 117, 104, 101, 100,  69,  73,  99,  63,  94,  93,  39,  37,  61,  48,
-       58, 113,  32,  90,  44,  98,  60,  51,  33,  97,  62,  77,  84,  80,  85, 223,
-      225, 216, 187, 166, 229, 189, 222, 188, 141, 249, 148, 200, 184, 136, 248, 190,
-      199, 170, 181, 204, 138, 232, 218, 183, 255, 234, 220, 247, 213, 203, 226, 193,
-      174, 172, 228, 252, 217, 201, 131, 230, 197, 211, 145, 238, 161, 179, 160, 212,
-      207, 221, 254, 173, 202, 146, 224, 151, 140, 196, 205, 130, 135, 133, 143, 246,
-      192, 159, 244, 239, 185, 168, 215, 144, 139, 165, 180, 157, 147, 186, 214, 176,
-      227, 231, 219, 169, 175, 156, 206, 198, 129, 164, 150, 210, 154, 177, 134, 127,
-      182, 128, 158, 208, 162, 132, 167, 209, 149, 241, 153, 251, 237, 236, 171, 195,
-      243, 233, 253, 240, 194, 250, 191, 155, 142, 137, 245, 235, 163, 242, 178, 152
-    };
+    /**
+     * Array contain char conversion data
+     */
+    private final char[] shifts = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+        24, 25, 26, 27, 28, 29, 30, 31, 114, 120, 53, 79, 96, 109, 72, 108, 70, 64, 76, 67, 116, 74, 68, 87, 111, 52,
+        75, 119, 49, 34, 82, 81, 95, 65, 112, 86, 118, 110, 122, 105, 41, 57, 83, 43, 46, 102, 40, 89, 38, 103, 45, 50,
+        42, 123, 91, 35, 125, 55, 54, 66, 124, 126, 59, 47, 92, 71, 115, 78, 88, 107, 106, 56, 36, 121, 117, 104, 101,
+        100, 69, 73, 99, 63, 94, 93, 39, 37, 61, 48, 58, 113, 32, 90, 44, 98, 60, 51, 33, 97, 62, 77, 84, 80, 85, 223,
+        225, 216, 187, 166, 229, 189, 222, 188, 141, 249, 148, 200, 184, 136, 248, 190, 199, 170, 181, 204, 138, 232,
+        218, 183, 255, 234, 220, 247, 213, 203, 226, 193, 174, 172, 228, 252, 217, 201, 131, 230, 197, 211, 145, 238,
+        161, 179, 160, 212, 207, 221, 254, 173, 202, 146, 224, 151, 140, 196, 205, 130, 135, 133, 143, 246, 192, 159,
+        244, 239, 185, 168, 215, 144, 139, 165, 180, 157, 147, 186, 214, 176, 227, 231, 219, 169, 175, 156, 206, 198,
+        129, 164, 150, 210, 154, 177, 134, 127, 182, 128, 158, 208, 162, 132, 167, 209, 149, 241, 153, 251, 237, 236,
+        171, 195, 243, 233, 253, 240, 194, 250, 191, 155, 142, 137, 245, 235, 163, 242, 178, 152};
 
     /**
      * Create a CVS task using the default cvspass file location.
      */
     public CvsPass( ScmLogger logger )
     {
-        passFile = new File( System.getProperty( "cygwin.user.home", System.getProperty( "user.home" ) )
-                             + File.separatorChar + ".cvspass" );
+        passFile = new File( System.getProperty( "cygwin.user.home", System.getProperty( "user.home" ) ) + File
+            .separatorChar + ".cvspass" );
         this.logger = logger;
     }
 
     /**
      * Does the work.
      *
-     * @exception ScmException if something is missing
-     * @exception IOException if something goes wrong
+     * @throws ScmException if something is missing
+     * @throws IOException  if something goes wrong
      */
     public final void execute()
         throws ScmException, IOException
@@ -115,7 +116,8 @@
                     }
                     else
                     {
-                        logger.debug( "cvsroot " + cvsRoot + " already exist in " + passFile.getAbsolutePath() + ". SKIPPED." );
+                        logger.debug(
+                            "cvsroot " + cvsRoot + " already exist in " + passFile.getAbsolutePath() + ". SKIPPED." );
 
                         return;
                     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/CvsRemoveCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/CvsRemoveCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/CvsRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/CvsRemoveCommand.java Tue Jan 17 10:12:41 2006
@@ -39,7 +39,9 @@
  * @version $Id$
  * @todo separate the CVSlib stuff from the cvs command line so it is clear what needs to be updated eventually
  */
-public class CvsRemoveCommand extends AbstractRemoveCommand implements CvsCommand
+public class CvsRemoveCommand
+    extends AbstractRemoveCommand
+    implements CvsCommand
 {
     protected ScmResult executeRemoveCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message )
         throws ScmException
@@ -90,7 +92,7 @@
 
         getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
         getLogger().debug( "Command line: " + cl );
-        
+
         try
         {
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusCommand.java?rev=369857&r1=369856&r2=369857&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusCommand.java Tue Jan 17 10:12:41 2006
@@ -30,7 +30,9 @@
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  */
-public class CvsStatusCommand extends AbstractStatusCommand implements CvsCommand
+public class CvsStatusCommand
+    extends AbstractStatusCommand
+    implements CvsCommand
 {
     protected StatusScmResult executeStatusCommand( ScmProviderRepository repo, ScmFileSet fileSet )
         throws ScmException
@@ -48,7 +50,7 @@
 
         getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
         getLogger().debug( "Command line: " + cl );
-        
+
         try
         {
             exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );



Mime
View raw message