Author: olamy
Date: Sat Apr 9 08:29:33 2011
New Revision: 1090546
URL: http://svn.apache.org/viewvc?rev=1090546&view=rev
Log:
code formatting
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java?rev=1090546&r1=1090545&r2=1090546&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
Sat Apr 9 08:29:33 2011
@@ -27,7 +27,6 @@ import org.apache.maven.scm.repository.S
import java.io.IOException;
-
/**
* Mark a set of files for deletion.
*
@@ -35,7 +34,9 @@ import java.io.IOException;
* @goal remove
* @aggregator
*/
-public class RemoveMojo extends AbstractScmMojo {
+public class RemoveMojo
+ extends AbstractScmMojo
+{
/**
* The commit message.
@@ -47,16 +48,23 @@ public class RemoveMojo extends Abstract
/**
* {@inheritDoc}
*/
- public void execute() throws MojoExecutionException {
+ public void execute()
+ throws MojoExecutionException
+ {
super.execute();
- try {
+ try
+ {
ScmRepository repository = getScmRepository();
- RemoveScmResult result = getScmManager().remove(repository,
getFileSet(), message);
- checkResult(result);
- } catch (IOException e) {
- throw new MojoExecutionException("Cannot run remove command : ",
e);
- } catch (ScmException e) {
- throw new MojoExecutionException("Cannot run remove command : ",
e);
+ RemoveScmResult result = getScmManager().remove( repository,
getFileSet(), message );
+ checkResult( result );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Cannot run remove command : " +
e.getMessage(), e );
+ }
+ catch ( ScmException e )
+ {
+ throw new MojoExecutionException( "Cannot run remove command : " +
e.getMessage(), e );
}
}
}
Modified:
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java?rev=1090546&r1=1090545&r2=1090546&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
Sat Apr 9 08:29:33 2011
@@ -22,7 +22,6 @@ package org.apache.maven.scm.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -30,67 +29,82 @@ import java.io.File;
/**
* @author <a href="p...@webotech.co.uk">Paul Mackinlay</a>
*/
-public class RemoveMojoTest extends AbstractMojoTestCase {
+public class RemoveMojoTest
+ extends AbstractMojoTestCase
+{
+
+ public void testShouldInvokeP4Delete()
+ throws Exception
+ {
- public void testShouldInvokeP4Delete() throws Exception {
-
- if ( !ScmTestCase.isSystemCmd("p4") )
+ if ( !ScmTestCase.isSystemCmd( "p4" ) )
{
System.out.println( "'skip test as p4 is not available" );
return;
}
String testConfig =
"src/test/resources/mojos/remove/removeWithPerforce.xml";
- try {
- RemoveMojo removeMojo = (RemoveMojo) lookupMojo("remove",
getTestFile(testConfig));
+ try
+ {
+ RemoveMojo removeMojo = (RemoveMojo) lookupMojo( "remove",
getTestFile( testConfig ) );
String connectionUrl = removeMojo.getConnectionUrl();
- connectionUrl = StringUtils.replace(connectionUrl, "${basedir}",
getBasedir());
- connectionUrl = StringUtils.replace(connectionUrl, "\\", "/");
- removeMojo.setWorkingDirectory(new File(getBasedir()));
- removeMojo.setConnectionUrl(connectionUrl);
+ connectionUrl = StringUtils.replace( connectionUrl, "${basedir}",
getBasedir() );
+ connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
+ removeMojo.setWorkingDirectory( new File( getBasedir() ) );
+ removeMojo.setConnectionUrl( connectionUrl );
removeMojo.execute();
- } finally {
+ }
+ finally
+ {
// Just to be sure unedit anything that has been marked for delete
- UnEditMojo unEditMojo = (UnEditMojo) lookupMojo("unedit",
getTestFile(testConfig));
+ UnEditMojo unEditMojo = (UnEditMojo) lookupMojo( "unedit",
getTestFile( testConfig ) );
String connectionUrl = unEditMojo.getConnectionUrl();
- connectionUrl = StringUtils.replace(connectionUrl, "${basedir}",
getBasedir());
- connectionUrl = StringUtils.replace(connectionUrl, "\\", "/");
- unEditMojo.setWorkingDirectory(new File(getBasedir()));
- unEditMojo.setConnectionUrl(connectionUrl);
+ connectionUrl = StringUtils.replace( connectionUrl, "${basedir}",
getBasedir() );
+ connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
+ unEditMojo.setWorkingDirectory( new File( getBasedir() ) );
+ unEditMojo.setConnectionUrl( connectionUrl );
unEditMojo.execute();
}
}
- public void testShouldFailToInvokeP4Delete() throws Exception {
- if ( !ScmTestCase.isSystemCmd("p4") )
+ public void testShouldFailToInvokeP4Delete()
+ throws Exception
+ {
+ if ( !ScmTestCase.isSystemCmd( "p4" ) )
{
System.out.println( "'skip test as p4 is not available" );
return;
}
String testConfig =
"src/test/resources/mojos/remove/removeWithPerforceNoIncludes.xml";
- try {
- RemoveMojo removeMojo = (RemoveMojo) lookupMojo("remove",
getTestFile(testConfig));
+ try
+ {
+ RemoveMojo removeMojo = (RemoveMojo) lookupMojo( "remove",
getTestFile( testConfig ) );
String connectionUrl = removeMojo.getConnectionUrl();
- connectionUrl = StringUtils.replace(connectionUrl, "${basedir}",
getBasedir());
- connectionUrl = StringUtils.replace(connectionUrl, "\\", "/");
- removeMojo.setWorkingDirectory(new File(getBasedir()));
- removeMojo.setConnectionUrl(connectionUrl);
+ connectionUrl = StringUtils.replace( connectionUrl, "${basedir}",
getBasedir() );
+ connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
+ removeMojo.setWorkingDirectory( new File( getBasedir() ) );
+ removeMojo.setConnectionUrl( connectionUrl );
- try {
+ try
+ {
removeMojo.execute();
- fail("At least one file needs to be included for removal");
- } catch (MojoExecutionException e) {
+ fail( "At least one file needs to be included for removal" );
+ }
+ catch ( MojoExecutionException e )
+ {
// we're expecting this exception
}
- } finally {
+ }
+ finally
+ {
// Just to be sure unedit anything that has been marked for delete
- UnEditMojo unEditMojo = (UnEditMojo) lookupMojo("unedit",
getTestFile(testConfig));
+ UnEditMojo unEditMojo = (UnEditMojo) lookupMojo( "unedit",
getTestFile( testConfig ) );
String connectionUrl = unEditMojo.getConnectionUrl();
- connectionUrl = StringUtils.replace(connectionUrl, "${basedir}",
getBasedir());
- connectionUrl = StringUtils.replace(connectionUrl, "\\", "/");
- unEditMojo.setWorkingDirectory(new File(getBasedir()));
- unEditMojo.setConnectionUrl(connectionUrl);
+ connectionUrl = StringUtils.replace( connectionUrl, "${basedir}",
getBasedir() );
+ connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
+ unEditMojo.setWorkingDirectory( new File( getBasedir() ) );
+ unEditMojo.setConnectionUrl( connectionUrl );
unEditMojo.execute();
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java?rev=1090546&r1=1090545&r2=1090546&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
Sat Apr 9 08:29:33 2011
@@ -41,45 +41,53 @@ import java.util.List;
* @version $Id$
*/
public class PerforceRemoveCommand
- extends AbstractRemoveCommand
- implements PerforceCommand {
+ extends AbstractRemoveCommand
+ implements PerforceCommand
+{
/**
* {@inheritDoc}
*/
- protected ScmResult executeRemoveCommand(ScmProviderRepository repo,
ScmFileSet files, String message)
- throws ScmException {
- Commandline cl = createCommandLine((PerforceScmProviderRepository)
repo, files.getBasedir(), files);
+ protected ScmResult executeRemoveCommand( ScmProviderRepository repo,
ScmFileSet files, String message )
+ throws ScmException
+ {
+ Commandline cl = createCommandLine( (PerforceScmProviderRepository)
repo, files.getBasedir(), files );
PerforceRemoveConsumer consumer = new PerforceRemoveConsumer();
- try {
+ try
+ {
CommandLineUtils.StringStreamConsumer err = new
CommandLineUtils.StringStreamConsumer();
- int exitCode = CommandLineUtils.executeCommandLine(cl, consumer,
err);
+ int exitCode = CommandLineUtils.executeCommandLine( cl, consumer,
err );
- if (exitCode != 0) {
- String cmdLine =
CommandLineUtils.toString(cl.getCommandline());
+ if ( exitCode != 0 )
+ {
+ String cmdLine = CommandLineUtils.toString(
cl.getCommandline() );
- StringBuilder msg = new StringBuilder("Exit code: " + exitCode
+ " - " + err.getOutput());
- msg.append('\n');
- msg.append("Command line was:" + cmdLine);
+ StringBuilder msg = new StringBuilder( "Exit code: " +
exitCode + " - " + err.getOutput() );
+ msg.append( '\n' );
+ msg.append( "Command line was:" + cmdLine );
- throw new CommandLineException(msg.toString());
+ throw new CommandLineException( msg.toString() );
}
- } catch (CommandLineException e) {
- throw new ScmException("CommandLineException " + e.getMessage(),
e);
+ }
+ catch ( CommandLineException e )
+ {
+ throw new ScmException( "CommandLineException " + e.getMessage(),
e );
}
- return new RemoveScmResult(cl.toString(), consumer.getRemovals());
+ return new RemoveScmResult( cl.toString(), consumer.getRemovals() );
}
- public static Commandline createCommandLine(PerforceScmProviderRepository
repo, File workingDirectory,
- ScmFileSet files) {
- Commandline command = PerforceScmProvider.createP4Command(repo,
workingDirectory);
- command.createArg().setValue("delete");
+ public static Commandline createCommandLine( PerforceScmProviderRepository
repo, File workingDirectory,
+ ScmFileSet files )
+ {
+ Commandline command = PerforceScmProvider.createP4Command( repo,
workingDirectory );
+ command.createArg().setValue( "delete" );
List<File> fs = files.getFileList();
- for (int i = 0; i < fs.size(); i++) {
- File file = (File) fs.get(i);
- command.createArg().setValue(file.getName());
+ for ( int i = 0; i < fs.size(); i++ )
+ {
+ File file = (File) fs.get( i );
+ command.createArg().setValue( file.getName() );
}
return command;
}
