You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2010/05/20 20:09:11 UTC
svn commit: r946735 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev:
./ command/blame/ command/login/
Author: olamy
Date: Thu May 20 18:09:11 2010
New Revision: 946735
URL: http://svn.apache.org/viewvc?rev=946735&view=rev
Log:
apply maven style (no code change)
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/login/AccuRevLoginCommand.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java?rev=946735&r1=946734&r2=946735&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java Thu May 20 18:09:11 2010
@@ -247,7 +247,7 @@ public interface AccuRev
boolean showRefTrees( Map<String, WorkSpace> workSpaces )
throws AccuRevException;
-
+
String getExecutable();
}
\ No newline at end of file
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java?rev=946735&r1=946734&r2=946735&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java Thu May 20 18:09:11 2010
@@ -345,7 +345,7 @@ public class AccuRevScmProvider
AccuRevRemoveCommand command = new AccuRevRemoveCommand( getLogger() );
return command.remove( repository, fileSet, parameters );
}
-
+
/** {@inheritDoc} */
protected BlameScmResult blame( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameConsumer.java?rev=946735&r1=946734&r2=946735&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameConsumer.java Thu May 20 18:09:11 2010
@@ -33,7 +33,7 @@ import java.util.List;
* @since 1.4
*/
public class AccuRevBlameConsumer
- extends AbstractConsumer
+ extends AbstractConsumer
{
private static final String ACCUREV_TIMESTAMP_PATTERN = "yyyy/MM/dd HH:mm:ss";
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/login/AccuRevLoginCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/login/AccuRevLoginCommand.java?rev=946735&r1=946734&r2=946735&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/login/AccuRevLoginCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/login/AccuRevLoginCommand.java Thu May 20 18:09:11 2010
@@ -32,37 +32,47 @@ import org.apache.maven.scm.provider.acc
import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
import org.apache.maven.scm.provider.accurev.command.AbstractAccuRevCommand;
-public class AccuRevLoginCommand extends AbstractAccuRevCommand {
-
- public AccuRevLoginCommand(ScmLogger logger) {
- super(logger);
+public class AccuRevLoginCommand
+ extends AbstractAccuRevCommand
+{
+
+ public AccuRevLoginCommand( ScmLogger logger )
+ {
+ super( logger );
}
@Override
- protected ScmResult executeAccurevCommand(AccuRevScmProviderRepository repository, ScmFileSet fileSet,
- CommandParameters parameters) throws ScmException, AccuRevException {
- boolean result = true;
-
- if (repository.getUser() != null) {
- AccuRev accurev = repository.getAccuRev();
- // Check if we've already logged in as this user and our token is still valid.
- AccuRevInfo info = accurev.info(null);
-
- if (!repository.getUser().equals(info.getUser())) {
- result = accurev.login(repository.getUser(), repository.getPassword());
- }
- return new LoginScmResult(accurev.getCommandLines(), null, accurev.getErrorOutput(), result);
- } else {
- getLogger().info("No AccuRev user supplied, assuming logged in externally");
- return new LoginScmResult(null, null, null, true);
- }
+ protected ScmResult executeAccurevCommand( AccuRevScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
+ throws ScmException, AccuRevException
+ {
+ boolean result = true;
+
+ if ( repository.getUser() != null )
+ {
+ AccuRev accurev = repository.getAccuRev();
+ // Check if we've already logged in as this user and our token is still valid.
+ AccuRevInfo info = accurev.info( null );
+
+ if ( !repository.getUser().equals( info.getUser() ) )
+ {
+ result = accurev.login( repository.getUser(), repository.getPassword() );
+ }
+ return new LoginScmResult( accurev.getCommandLines(), null, accurev.getErrorOutput(), result );
+ }
+ else
+ {
+ getLogger().info( "No AccuRev user supplied, assuming logged in externally" );
+ return new LoginScmResult( null, null, null, true );
+ }
}
- public LoginScmResult login(ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters)
- throws ScmException {
- return (LoginScmResult) execute(repository, fileSet, parameters);
+ public LoginScmResult login( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ throws ScmException
+ {
+ return (LoginScmResult) execute( repository, fileSet, parameters );
}
}