You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/05/04 00:37:09 UTC
svn commit: r1333668 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy:
./ command/add/ command/changelog/ command/checkin/ command/checkout/
command/edit/ command/remove/ command/s...
Author: hboutemy
Date: Thu May 3 22:37:08 2012
New Revision: 1333668
URL: http://svn.apache.org/viewvc?rev=1333668&view=rev
Log:
o fixed typos
o use Java 5 for loop syntax
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java
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/remove/SynergyRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.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/command/unedit/SynergyUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.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/SynergyScmProvider.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java Thu May 3 22:37:08 2012
@@ -58,10 +58,7 @@ public class SynergyScmProvider
public ScmProviderRepository makeProviderScmRepository( String scmSpecificUrl, char delimiter )
throws ScmRepositoryException
{
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Creating SynergyScmProviderRepository...");
- }
+ getLogger().debug( "Creating SynergyScmProviderRepository..." );
return new SynergyScmProviderRepository( scmSpecificUrl );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.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/add/SynergyAddCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java Thu May 3 22:37:08 2012
@@ -107,8 +107,8 @@ public class SynergyAddCommand
{
SynergyUtil.stop( getLogger(), ccmAddr );
}
- List<ScmFile> scmFiles = new ArrayList<ScmFile>(fileSet.getFileList().size());
- for (File f : fileSet.getFileList())
+ List<ScmFile> scmFiles = new ArrayList<ScmFile>( fileSet.getFileList().size() );
+ for ( File f : fileSet.getFileList() )
{
scmFiles.add( new ScmFile( f.getPath(), ScmFileStatus.ADDED ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.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/changelog/SynergyChangeLogCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java Thu May 3 22:37:08 2012
@@ -77,7 +77,7 @@ public class SynergyChangeLogCommand
throw new ScmException( "You should checkout a working project first" );
}
List<SynergyTask> tasks = SynergyUtil.getCompletedTasks( getLogger(), projectSpec, startDate, endDate, ccmAddr );
- for (SynergyTask t : tasks )
+ for ( SynergyTask t : tasks )
{
ChangeSet cs = new ChangeSet();
cs.setAuthor( t.getUsername() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.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/checkin/SynergyCheckInCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java Thu May 3 22:37:08 2012
@@ -73,8 +73,8 @@ public class SynergyCheckInCommand
{
SynergyUtil.stop( getLogger(), ccmAddr );
}
- List<ScmFile> scmFiles = new ArrayList<ScmFile>(fileSet.getFileList().size());
- for (File f : fileSet.getFileList())
+ List<ScmFile> scmFiles = new ArrayList<ScmFile>( fileSet.getFileList().size() );
+ for ( File f : fileSet.getFileList() )
{
scmFiles.add( new ScmFile( f.getPath(), ScmFileStatus.CHECKED_IN ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.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/checkout/SynergyCheckOutCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java Thu May 3 22:37:08 2012
@@ -133,8 +133,8 @@ public class SynergyCheckOutCommand
try
{
@SuppressWarnings( "unchecked" )
- List<File> realFiles = FileUtils.getFiles( fileSet.getBasedir(), null, "_ccmwaid.inf" );
- for (File f : realFiles)
+ List<File> realFiles = FileUtils.getFiles( fileSet.getBasedir(), null, "_ccmwaid.inf" );
+ for ( File f : realFiles )
{
files.add( new ScmFile( f.getPath(), ScmFileStatus.CHECKED_OUT ) );
}
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=1333668&r1=1333667&r2=1333668&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 Thu May 3 22:37:08 2012
@@ -22,7 +22,6 @@ package org.apache.maven.scm.provider.sy
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -36,7 +35,6 @@ import org.apache.maven.scm.command.edit
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.synergy.command.SynergyCommand;
import org.apache.maven.scm.provider.synergy.repository.SynergyScmProviderRepository;
-import org.apache.maven.scm.provider.synergy.util.SynergyTaskManager;
import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
import org.codehaus.plexus.util.FileUtils;
@@ -82,9 +80,8 @@ public class SynergyEditCommand
{
getLogger().info( "Task " + taskNum + " was created to perform checkout." );
}
- for ( Iterator<File> i = fileSet.getFileList().iterator(); i.hasNext(); )
+ for ( File f : fileSet.getFileList() )
{
- File f = (File) i.next();
File dest = f;
File source = new File( sourcePath, SynergyUtil.removePrefix( fileSet.getBasedir(), f ) );
List<File> list = new LinkedList<File>();
@@ -111,8 +108,8 @@ public class SynergyEditCommand
{
SynergyUtil.stop( getLogger(), ccmAddr );
}
- List<ScmFile> scmFiles = new ArrayList<ScmFile>(fileSet.getFileList().size());
- for (File f : fileSet.getFileList())
+ List<ScmFile> scmFiles = new ArrayList<ScmFile>( fileSet.getFileList().size() );
+ for ( File f : fileSet.getFileList() )
{
scmFiles.add( new ScmFile( f.getPath(), ScmFileStatus.EDITED ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.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/remove/SynergyRemoveCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java Thu May 3 22:37:08 2012
@@ -91,7 +91,7 @@ public class SynergyRemoveCommand
SynergyUtil.stop( getLogger(), ccmAddr );
}
List<ScmFile> scmFiles = new ArrayList<ScmFile>();
- for (File file : fileSet.getFileList())
+ for ( File file : fileSet.getFileList() )
{
scmFiles.add( new ScmFile( file.getPath(), ScmFileStatus.DELETED ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.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/status/SynergyStatusCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java Thu May 3 22:37:08 2012
@@ -30,7 +30,6 @@ import org.apache.maven.scm.provider.syn
import org.apache.maven.scm.provider.synergy.repository.SynergyScmProviderRepository;
import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -71,10 +70,9 @@ public class SynergyStatusCommand
}
List<ScmFile> result = new LinkedList<ScmFile>();
- for ( Iterator<String> i = l.iterator(); i.hasNext(); )
+ for ( String filename : l )
{
-
- ScmFile f = new ScmFile( i.next(), ScmFileStatus.MODIFIED );
+ ScmFile f = new ScmFile( filename, ScmFileStatus.MODIFIED );
result.add( f );
}
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=1333668&r1=1333667&r2=1333668&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 Thu May 3 22:37:08 2012
@@ -80,15 +80,15 @@ public class SynergyTagCommand
SynergyUtil.reconfigureProperties( getLogger(), repo.getProjectSpec(), ccmAddr );
SynergyUtil.reconfigure( getLogger(), repo.getProjectSpec(), ccmAddr);
- SynergyUtil.createBaseline( getLogger(), repo.getProjectSpec(), tag, repo.getProjectRelease(), repo
- .getProjectPurpose(), ccmAddr );
+ SynergyUtil.createBaseline( getLogger(), repo.getProjectSpec(), tag, repo.getProjectRelease(),
+ repo.getProjectPurpose(), ccmAddr );
}
finally
{
SynergyUtil.stop( getLogger(), ccmAddr );
}
- List<ScmFile> files = new ArrayList<ScmFile>(fileSet.getFileList().size());
- for (File f : fileSet.getFileList())
+ List<ScmFile> files = new ArrayList<ScmFile>( fileSet.getFileList().size() );
+ for ( File f : fileSet.getFileList() )
{
files.add( new ScmFile( f.getPath(), ScmFileStatus.TAGGED ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.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/unedit/SynergyUnEditCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java Thu May 3 22:37:08 2012
@@ -22,7 +22,6 @@ package org.apache.maven.scm.provider.sy
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.scm.ScmException;
@@ -74,9 +73,8 @@ public class SynergyUnEditCommand
}
File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
File destPath = new File( waPath, repo.getProjectName() );
- for ( Iterator<File> i = fileSet.getFileList().iterator(); i.hasNext(); )
+ for ( File f : fileSet.getFileList() )
{
- File f = i.next();
File source = new File( fileSet.getBasedir(), f.getPath() );
File dest = new File( destPath, f.getPath() );
SynergyUtil.delete( getLogger(), dest, ccmAddr, true );
@@ -102,9 +100,9 @@ public class SynergyUnEditCommand
SynergyUtil.stop( getLogger(), ccmAddr );
}
List<ScmFile> files = new ArrayList<ScmFile>();
- for (File f : fileSet.getFileList())
+ for ( File f : fileSet.getFileList() )
{
- files.add( new ScmFile(f.getPath(), ScmFileStatus.UNKNOWN) );
+ files.add( new ScmFile( f.getPath(), ScmFileStatus.UNKNOWN ) );
}
return new UnEditScmResult( "", files );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.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/update/SynergyUpdateCommand.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java Thu May 3 22:37:08 2012
@@ -138,10 +138,8 @@ public class SynergyUpdateCommand
String sourcePath = sourceDirectory.getAbsolutePath();
- for ( int i = 0; i < files.length; i++ )
+ for ( File file : files )
{
- File file = files[i];
-
String dest = file.getAbsolutePath();
dest = dest.substring( sourcePath.length() + 1 );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.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/repository/SynergyScmProviderRepository.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java Thu May 3 22:37:08 2012
@@ -104,7 +104,7 @@ public class SynergyScmProviderRepositor
projectSpec = projectName + delimiter + projectVersion + ":project:" + instance;
}
- else if (tokenizer.countTokens() == 6 )
+ else if ( tokenizer.countTokens() == 6 )
{ //optional prep project instance also
projectName = tokenizer.nextToken();
delimiter = tokenizer.nextToken();
@@ -156,7 +156,8 @@ public class SynergyScmProviderRepositor
/**
* @return the instance
*/
- public String getInstance() {
+ public String getInstance()
+ {
return instance;
}
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=1333668&r1=1333667&r2=1333668&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 Thu May 3 22:37:08 2012
@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Properties;
/**
- * This class contains methods to execute Synergy ccm command line.
+ * This class contains methods to execute Synergy <code>ccm</code> command line.
*
* @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
* @version $Id$
@@ -81,7 +81,7 @@ public class SynergyCCM
* @param taskNumber Task number.
* @param format Output format.
* @param ccmAddr
- * @return the commandl ine.
+ * @return the commandline.
* @throws ScmException
*/
public static Commandline showTaskObjects( int taskNumber, String format, String ccmAddr )
@@ -211,9 +211,8 @@ public class SynergyCCM
}
- for ( Iterator<File> i = files.iterator(); i.hasNext(); )
+ for ( File f : files )
{
- File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -326,9 +325,8 @@ public class SynergyCCM
cl.createArg().setValue( "-replace" );
}
- for ( Iterator<File> i = files.iterator(); i.hasNext(); )
+ for ( File f : files )
{
- File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -518,9 +516,8 @@ public class SynergyCCM
cl.setExecutable( CCM );
cl.createArg().setValue( CO );
- for ( Iterator<File> i = files.iterator(); i.hasNext(); )
+ for ( File f : files )
{
- File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -649,9 +646,8 @@ public class SynergyCCM
if ( files.size() > 0 )
{
- for ( Iterator<File> i = files.iterator(); i.hasNext(); )
+ for ( File f : files )
{
- File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -733,7 +729,7 @@ public class SynergyCCM
}
/**
- * Configure a commandline to use environement variables ($PATH)
+ * Configure a commandline to use environment variables ($PATH)
*
* @param cl
* @param ccmAddr
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.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/SynergyUtil.java?rev=1333668&r1=1333667&r2=1333668&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java Thu May 3 22:37:08 2012
@@ -45,7 +45,7 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.StreamConsumer;
/**
- * This class contains functional methodsfor Synergy.
+ * This class contains functional methods for Synergy.
*
* @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
* @author Olivier Lamy
@@ -110,7 +110,7 @@ public final class SynergyUtil
}
String query =
- "owner='" + username + "' and status='working' and type='project' and has_predecessor('" + projectSpec +"')";
+ "owner='" + username + "' and status='working' and type='project' and has_predecessor('" + projectSpec + "')";
//+ ":project:1')"; SCM-261
Commandline cl = SynergyCCM.query( query, "%objectname", ccmAddr );