Author: olamy
Date: Wed Aug 20 15:36:12 2008
New Revision: 687493
URL: http://svn.apache.org/viewvc?rev=687493&view=rev
Log:
fix checkstyle issues
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingProjectConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java?rev=687493&r1=687492&r2=687493&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
Wed Aug 20 15:36:12 2008
@@ -65,8 +65,8 @@
{
throw new ScmException( "You should checkout project first" );
}
- int taskNum = SynergyUtil.createTask( getLogger(), "Maven SCM
Synergy provider: edit command for project " +
- repo.getProjectSpec(), repo.getProjectRelease(), true, ccmAddr
);
+ int taskNum = SynergyUtil.createTask( getLogger(), "Maven SCM
Synergy provider: edit command for project "
+ + repo.getProjectSpec(), repo.getProjectRelease(), true,
ccmAddr );
getLogger().info( "Task " + taskNum + " was created to perform
checkout." );
for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java?rev=687493&r1=687492&r2=687493&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
Wed Aug 20 15:36:12 2008
@@ -48,16 +48,16 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository)
repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(),
repo.getPassword(), SynergyRole.BUILD_MGR );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(),
repo.getPassword(), SynergyRole.BUILD_MGR );
try
{
SynergyUtil.createBaseline( getLogger(), repo.getProjectSpec(),
tag, repo.getProjectRelease(), repo
- .getProjectPurpose(), CCM_ADDR );
+ .getProjectPurpose(), ccmAddr );
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
return new TagScmResult( "", fileSet.getFileList() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java?rev=687493&r1=687492&r2=687493&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
Wed Aug 20 15:36:12 2008
@@ -51,8 +51,8 @@
private String country = "US";
- public static final String OUTPUT_FORMAT = "%displayname" +
SynergyUtil.SEPARATOR + "%owner" + SynergyUtil.SEPARATOR +
- "%completion_date" + SynergyUtil.SEPARATOR + "%task_synopsis" +
SynergyUtil.SEPARATOR;
+ public static final String OUTPUT_FORMAT = "%displayname" +
SynergyUtil.SEPARATOR + "%owner"
+ + SynergyUtil.SEPARATOR + "%completion_date" + SynergyUtil.SEPARATOR +
"%task_synopsis" + SynergyUtil.SEPARATOR;
private List entries = new ArrayList();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingProjectConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingProjectConsumer.java?rev=687493&r1=687492&r2=687493&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingProjectConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingProjectConsumer.java
Wed Aug 20 15:36:12 2008
@@ -37,7 +37,7 @@
{
private ScmLogger logger;
- private String project_spec;
+ private String projectSpec;
public SynergyGetWorkingProjectConsumer( ScmLogger logger )
{
@@ -50,12 +50,12 @@
logger.debug( line );
if ( !line.trim().equals( "" ) )
{
- project_spec = line.trim();
+ projectSpec = line.trim();
}
}
public String getProjectSpec()
{
- return project_spec;
+ return projectSpec;
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java?rev=687493&r1=687492&r2=687493&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
Wed Aug 20 15:36:12 2008
@@ -275,13 +275,13 @@
/**
* Create command line for checkin a task
*
- * @param task_specs task_specs or default
+ * @param taskSpecs task_specs or default
* @param comment comment.
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline checkinTask( String task_specs, String comment,
String ccmAddr )
+ public static Commandline checkinTask( String taskSpecs, String comment,
String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -293,7 +293,7 @@
cl.createArgument().setValue( "-checkin" );
- cl.createArgument().setValue( task_specs );
+ cl.createArgument().setValue( taskSpecs );
cl.createArgument().setValue( "-comment" );
cl.createArgument().setValue( comment );
@@ -346,12 +346,12 @@
/**
* Create commandline to reconfigure a project.
*
- * @param project_spec
+ * @param projectSpec
* @param ccmAddr
* @return the command line.
* @throws ScmException
*/
- public static Commandline reconfigure( String project_spec, String ccmAddr
)
+ public static Commandline reconfigure( String projectSpec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -363,10 +363,10 @@
cl.createArgument().setValue( "-recurse" );
- if ( project_spec != null )
+ if ( projectSpec != null )
{
cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
}
return cl;
@@ -376,12 +376,12 @@
/**
* Create commandline to reconfigure properties of a project.
*
- * @param project_spec
+ * @param projectSpec
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline reconfigureProperties( String project_spec,
String ccmAddr )
+ public static Commandline reconfigureProperties( String projectSpec,
String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -392,7 +392,7 @@
cl.createArgument().setValue( RECONFIGURE_PROPERTIES );
cl.createArgument().setValue( "-refresh" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
return cl;
@@ -401,12 +401,12 @@
/**
* Create command line to reconcile a project with uwa option.
*
- * @param project_spec
+ * @param projectSpec
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline reconcileUwa( String project_spec, String
ccmAddr )
+ public static Commandline reconcileUwa( String projectSpec, String ccmAddr
)
throws ScmException
{
Commandline cl = new Commandline();
@@ -419,10 +419,10 @@
cl.createArgument().setValue( "-r" );
cl.createArgument().setValue( "-uwa" ); // Update wa from database
- if ( project_spec != null )
+ if ( projectSpec != null )
{
cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
}
return cl;
@@ -432,12 +432,12 @@
/**
* Create command line to reconcile a project with udb option.
*
- * @param project_spec
+ * @param projectSpec
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline reconcileUdb( String project_spec, String
ccmAddr )
+ public static Commandline reconcileUdb( String projectSpec, String ccmAddr
)
throws ScmException
{
Commandline cl = new Commandline();
@@ -450,10 +450,10 @@
cl.createArgument().setValue( "-r" );
cl.createArgument().setValue( "-udb" ); // Update database from wa
- if ( project_spec != null )
+ if ( projectSpec != null )
{
cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
}
return cl;
@@ -538,14 +538,14 @@
* Create commandline to checkout a project
*
* @param directory target WA, or null if using default directory
- * @param project_spec
+ * @param projectSpec
* @param version new version of the project, or null if using
default Synergy
* mecanism
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline checkoutProject( File directory, String
project_spec, ScmVersion version, String purpose,
+ public static Commandline checkoutProject( File directory, String
projectSpec, ScmVersion version, String purpose,
String release, String ccmAddr )
throws ScmException
{
@@ -589,7 +589,7 @@
}
}
cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
return cl;
}
@@ -597,13 +597,13 @@
/**
* Create commandline to checkin a project
*
- * @param project_spec
+ * @param projectSpec
* @param comment
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline checkinProject( String project_spec, String
comment, String ccmAddr )
+ public static Commandline checkinProject( String projectSpec, String
comment, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -618,7 +618,7 @@
cl.createArgument().setValue( comment );
}
cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
return cl;
}
@@ -668,12 +668,12 @@
/**
* Create commandline to synchronize a project
*
- * @param project_spec
+ * @param projectSpec
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline synchronize( String project_spec, String ccmAddr
)
+ public static Commandline synchronize( String projectSpec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -684,7 +684,7 @@
cl.createArgument().setValue( SYNC );
cl.createArgument().setValue( "-r" ); // Recursive
cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
return cl;
}
@@ -692,12 +692,12 @@
/**
* Create commandline to get workarea informations for a given project.
*
- * @param project_spec
+ * @param projectSpec
* @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline showWorkArea( String project_spec, String
ccmAddr )
+ public static Commandline showWorkArea( String projectSpec, String ccmAddr
)
throws ScmException
{
Commandline cl = new Commandline();
@@ -707,7 +707,7 @@
cl.setExecutable( CCM );
cl.createArgument().setValue( WA );
cl.createArgument().setValue( "-show" );
- cl.createArgument().setValue( project_spec );
+ cl.createArgument().setValue( projectSpec );
return cl;
}
