Author: olamy
Date: Mon Nov 14 08:05:26 2011
New Revision: 1201622
URL: http://svn.apache.org/viewvc?rev=1201622&view=rev
Log:
formatting no functionnal change
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java?rev=1201622&r1=1201621&r2=1201622&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
Mon Nov 14 08:05:26 2011
@@ -19,9 +19,6 @@ package org.apache.maven.scm.provider.gi
* under the License.
*/
-import java.io.File;
-import java.util.List;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -33,14 +30,21 @@ import org.apache.maven.scm.provider.git
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+import java.util.List;
+
/**
* @author <a href="mailto:strub...@yahoo.de";>Mark Struberg</a>
* @author Olivier Lamy
* @version $Id$
*/
-public class GitRemoveCommand extends AbstractRemoveCommand implements
GitCommand
+public class GitRemoveCommand
+ extends AbstractRemoveCommand
+ implements GitCommand
{
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected ScmResult executeRemoveCommand( ScmProviderRepository repo,
ScmFileSet fileSet, String message )
throws ScmException
{
@@ -68,18 +72,20 @@ public class GitRemoveCommand extends Ab
}
public static Commandline createCommandLine( File workingDirectory,
List<File> files )
- throws ScmException
+ throws ScmException
{
- Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(
workingDirectory, "rm" );
+ Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(
workingDirectory, "rm" );
+
+ for ( File file : files )
+ {
+ if ( file.isDirectory() )
+ {
+ cl.createArg().setValue( "-r" );
+ break;
+ }
+ }
- for(File file : files) {
- if (file.isDirectory()) {
- cl.createArg().setValue("-r");
- break;
- }
- }
-
- GitCommandLineUtils.addTarget( cl, files );
+ GitCommandLineUtils.addTarget( cl, files );
return cl;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java?rev=1201622&r1=1201621&r2=1201622&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java
Mon Nov 14 08:05:26 2011
@@ -34,7 +34,8 @@ import java.util.List;
* @author Olivier Lamy
* @version $Id$
*/
-public class GitRemoveConsumer implements StreamConsumer
+public class GitRemoveConsumer
+ implements StreamConsumer
{
/**
* The pattern used to match deleted file lines
@@ -73,7 +74,9 @@ public class GitRemoveConsumer implement
// StreamConsumer Implementation
// ----------------------------------------------------------------------
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void consumeLine( String line )
{
if ( line.length() <= 2 )
