Author: olamy Date: Sun Jan 2 18:40:29 2011 New Revision: 1054455 URL: http://svn.apache.org/viewvc?rev=1054455&view=rev Log: [SCM-591] move to Java 1.5 : checkin command
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkin/LocalCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.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-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.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/checkin/GitCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -31,6 +31,7 @@ import org.apache.maven.scm.provider.Scm /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse</a> * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> + * @author Olivier Lamy * @version $Id$ */ public abstract class AbstractCheckInCommand Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java Sun Jan 2 18:40:29 2011 @@ -19,19 +19,24 @@ package org.apache.maven.scm.command.che * under the License. */ -import org.apache.maven.scm.ScmResult; - +import java.util.ArrayList; import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.ScmResult; + /** * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> + * @author Olivier Lamy * @version $Id$ */ public class CheckInScmResult extends ScmResult { - private List checkedInFiles; + private static final long serialVersionUID = 954225589449445354L; + + private List<ScmFile> checkedInFiles; private String scmRevision; @@ -40,7 +45,7 @@ public class CheckInScmResult super( commandLine, providerMessage, commandOutput, success ); } - public CheckInScmResult( String commandLine, List checkedInFiles ) + public CheckInScmResult( String commandLine, List<ScmFile> checkedInFiles ) { super( commandLine, null, null, true ); @@ -53,14 +58,14 @@ public class CheckInScmResult * @param scmRevision * @since 1.2 */ - public CheckInScmResult( String commandLine, List checkedInFiles, String scmRevision ) + public CheckInScmResult( String commandLine, List<ScmFile> checkedInFiles, String scmRevision ) { this( commandLine, checkedInFiles ); this.scmRevision = scmRevision; } - public CheckInScmResult( List checkedInFiles, ScmResult result ) + public CheckInScmResult( List<ScmFile> checkedInFiles, ScmResult result ) { super( result ); @@ -68,8 +73,12 @@ public class CheckInScmResult } - public List getCheckedInFiles() + public List<ScmFile> getCheckedInFiles() { + if (this.checkedInFiles == null) + { + this.checkedInFiles = new ArrayList<ScmFile>(); + } return checkedInFiles; } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.ba * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.List; + import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -36,13 +40,9 @@ import org.apache.maven.scm.provider.baz import org.apache.maven.scm.provider.bazaar.repository.BazaarScmProviderRepository; import org.codehaus.plexus.util.StringUtils; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** - * @author <a href="mailto:torbj...@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a> + * @author <a href="mailto:torbj...@smorgrav.org">Torbjorn Eikli Smorgrav</a> + * @author Olivier Lamy * @version $Id$ */ public class BazaarCheckInCommand @@ -60,17 +60,16 @@ public class BazaarCheckInCommand } // Get files that will be committed (if not specified in fileSet) - List commitedFiles = new ArrayList(); - File[] files = fileSet.getFiles(); - if ( files.length == 0 ) + List<ScmFile> commitedFiles = new ArrayList<ScmFile>(); + List<File> files = fileSet.getFileList(); + if ( files.isEmpty() ) { //Either commit all changes BazaarStatusCommand statusCmd = new BazaarStatusCommand(); statusCmd.setLogger( getLogger() ); StatusScmResult status = statusCmd.executeStatusCommand( repo, fileSet ); - List statusFiles = status.getChangedFiles(); - for ( Iterator it = statusFiles.iterator(); it.hasNext(); ) + List<ScmFile> statusFiles = status.getChangedFiles(); + for ( ScmFile file : statusFiles ) { - ScmFile file = (ScmFile) it.next(); if ( file.getStatus() == ScmFileStatus.ADDED || file.getStatus() == ScmFileStatus.DELETED || file.getStatus() == ScmFileStatus.MODIFIED ) { @@ -81,9 +80,9 @@ public class BazaarCheckInCommand } else { //Or commit spesific files - for ( int i = 0; i < files.length; i++ ) + for ( File file : files ) { - commitedFiles.add( new ScmFile( files[i].getPath(), ScmFileStatus.CHECKED_IN ) ); + commitedFiles.add( new ScmFile( file.getPath(), ScmFileStatus.CHECKED_IN ) ); } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.cl * 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.ScmVersion; @@ -30,10 +33,9 @@ import org.codehaus.plexus.util.cli.Comm import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; -import java.io.File; - /** * @author <a href="mailto:wim.debla...@gmail.com">Wim Deblauwe</a> + * @author Olivier Lamy * @version $Id$ */ public class ClearCaseCheckInCommand @@ -111,14 +113,13 @@ public class ClearCaseCheckInCommand command.createArg().setValue( "-nc" ); } - File[] files = scmFileSet.getFiles(); - if ( files.length == 0 ) + List<File> files = scmFileSet.getFileList(); + if ( files.isEmpty() ) { throw new ScmException( "There are no files in the fileset to check in!" ); } - for ( int i = 0; i < files.length; i++ ) + for ( File file : files ) { - File file = files[i]; command.createArg().setValue( file.getAbsolutePath() ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java Sun Jan 2 18:40:29 2011 @@ -36,7 +36,7 @@ public class ClearCaseCheckInConsumer { private ScmLogger logger; - private List checkedInFiles = new ArrayList(); + private List<ScmFile> checkedInFiles = new ArrayList<ScmFile>(); // ---------------------------------------------------------------------- // @@ -70,7 +70,7 @@ public class ClearCaseCheckInConsumer // // ---------------------------------------------------------------------- - public List getCheckedInFiles() + public List<ScmFile> getCheckedInFiles() { return checkedInFiles; } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.hg * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.List; + import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -36,13 +40,9 @@ import org.apache.maven.scm.provider.hg. import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository; import org.codehaus.plexus.util.StringUtils; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * @author <a href="mailto:thurner.rup...@ymono.net">thurner rupert</a> + * @author Olivier Lamy * @version $Id$ */ public class HgCheckInCommand @@ -66,17 +66,16 @@ public class HgCheckInCommand boolean differentOutgoingBranch = HgUtils.differentOutgoingBranchFound( getLogger(), workingDir, branchName ); // Get files that will be committed (if not specified in fileSet) - List commitedFiles = new ArrayList(); - File[] files = fileSet.getFiles(); - if ( files.length == 0 ) + List<ScmFile> commitedFiles = new ArrayList<ScmFile>(); + List<File> files = fileSet.getFileList(); + if ( files.isEmpty() ) { //Either commit all changes HgStatusCommand statusCmd = new HgStatusCommand(); statusCmd.setLogger( getLogger() ); StatusScmResult status = statusCmd.executeStatusCommand( repo, fileSet ); - List statusFiles = status.getChangedFiles(); - for ( Iterator it = statusFiles.iterator(); it.hasNext(); ) + List<ScmFile> statusFiles = status.getChangedFiles(); + for ( ScmFile file : statusFiles ) { - ScmFile file = (ScmFile) it.next(); if ( file.getStatus() == ScmFileStatus.ADDED || file.getStatus() == ScmFileStatus.DELETED || file.getStatus() == ScmFileStatus.MODIFIED ) { @@ -87,9 +86,9 @@ public class HgCheckInCommand } else { //Or commit spesific files - for ( int i = 0; i < files.length; i++ ) + for ( File file : files ) { - commitedFiles.add( new ScmFile( files[i].getPath(), ScmFileStatus.CHECKED_IN ) ); + commitedFiles.add( new ScmFile( file.getPath(), ScmFileStatus.CHECKED_IN ) ); } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkin/LocalCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkin/LocalCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkin/LocalCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkin/LocalCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -19,6 +19,11 @@ package org.apache.maven.scm.provider.lo * under the License. */ +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -32,13 +37,6 @@ import org.apache.maven.scm.provider.loc import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - /** * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> * @version $Id$ @@ -83,26 +81,25 @@ public class LocalCheckInCommand throw new ScmException( "The module directory doesn't exist (" + source.getAbsolutePath() + ")." ); } - List checkedInFiles = new ArrayList(); + List<ScmFile> checkedInFiles = new ArrayList<ScmFile>(); try { // Only copy files newer than in the repo File repoRoot = new File( repository.getRoot(), repository.getModule() ); - List files = Arrays.asList( fileSet.getFiles() ); + List<File> files = fileSet.getFileList(); if ( files.isEmpty() ) { - files = FileUtils.getFiles( baseDestination, "**", null, false ); + @SuppressWarnings( "unchecked" ) + List<File> listFiles = FileUtils.getFiles( baseDestination, "**", null, false ); + + files = listFiles; } - Iterator it = files.iterator(); - - while ( it.hasNext() ) + for ( File file : files ) { - File file = (File) it.next(); - String path = file.getPath().replace( '\\', '/' ); File repoFile = new File( repoRoot, path ); file = new File( baseDestination, path ); @@ -142,9 +139,9 @@ public class LocalCheckInCommand } FileUtils.copyFile( file, repoFile ); - - System.err.println( new ScmFile( path, status ) ); - checkedInFiles.add( new ScmFile( path, status ) ); + ScmFile scmFile = new ScmFile( path, status); + getLogger().info( scmFile.toString() ); + checkedInFiles.add( scmFile ); } } catch ( IOException ex ) Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.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/checkin/PerforceCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -19,9 +19,9 @@ package org.apache.maven.scm.provider.pe * under the License. */ +import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; -import java.io.StringBufferInputStream; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -75,7 +75,7 @@ public class PerforceCheckInCommand } CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer(); - int exitCode = CommandLineUtils.executeCommandLine( cl, new StringBufferInputStream(changes), consumer, err ); + int exitCode = CommandLineUtils.executeCommandLine( cl, new ByteArrayInputStream(changes.getBytes()), consumer, err ); if ( exitCode != 0 ) { @@ -126,10 +126,10 @@ public class PerforceCheckInCommand buf.append( "Files:" ).append( NEWLINE ); try { - Set dupes = new HashSet(); + Set<String> dupes = new HashSet<String>(); File workingDir = files.getBasedir(); String candir = workingDir.getCanonicalPath(); - List fs = files.getFileList(); + List<File> fs = files.getFileList(); for ( int i = 0; i < fs.size(); i++ ) { File file = (File) fs.get( i ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -38,6 +38,7 @@ import java.util.List; /** * @author <a href="mailto:dant...@gmail.com">Dan T. Tran</a> + * @author Olivier Lamy * @version $Id$ */ public class StarteamCheckInCommand @@ -76,9 +77,9 @@ public class StarteamCheckInCommand CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); - List checkInFiles = fileSet.getFileList(); + List<File> checkInFiles = fileSet.getFileList(); - if ( checkInFiles.size() == 0 ) + if ( checkInFiles.isEmpty() ) { Commandline cl = createCommandLine( repository, fileSet, message, version, issueType, issueValue ); @@ -116,7 +117,7 @@ public class StarteamCheckInCommand public static Commandline createCommandLine( StarteamScmProviderRepository repo, ScmFileSet fileSet, String message, ScmVersion version, String issueType, String issueValue ) { - List args = new ArrayList(); + List<String> args = new ArrayList<String>(); if ( message != null && message.length() != 0 ) { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java Sun Jan 2 18:40:29 2011 @@ -30,6 +30,7 @@ import java.util.List; /** * @author <a href="mailto:dant...@gmail.com">Dan T. Tran</a> + * @author Olivier Lamy * @version $Id$ */ public class StarteamCheckInConsumer @@ -39,7 +40,7 @@ public class StarteamCheckInConsumer private ScmLogger logger; - private List files = new ArrayList(); + private List<ScmFile> files = new ArrayList<ScmFile>(); /** * the current directory entry being processed by the parser @@ -108,7 +109,7 @@ public class StarteamCheckInConsumer } - public List getCheckedInFiles() + public List<ScmFile> getCheckedInFiles() { return files; } 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=1054455&r1=1054454&r2=1054455&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 Sun Jan 2 18:40:29 2011 @@ -19,8 +19,14 @@ package org.apache.maven.scm.provider.sy * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.List; + import org.apache.maven.scm.ScmException; +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; +import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.ScmVersion; import org.apache.maven.scm.command.checkin.AbstractCheckInCommand; import org.apache.maven.scm.command.checkin.CheckInScmResult; @@ -31,6 +37,7 @@ import org.apache.maven.scm.provider.syn /** * @author <a href="mailto:julien.he...@capgemini.com">Julien Henry</a> + * @author Olivier Lamy * @version $Id$ */ public class SynergyCheckInCommand @@ -65,8 +72,12 @@ public class SynergyCheckInCommand { SynergyUtil.stop( getLogger(), ccmAddr ); } - - return new CheckInScmResult( "ccm checkin", 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 ) ); + } + return new CheckInScmResult( "ccm checkin", scmFiles ); } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -22,10 +22,10 @@ package org.apache.maven.scm.provider.vs 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; +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmVersion; import org.apache.maven.scm.command.checkin.AbstractCheckInCommand; @@ -39,17 +39,19 @@ import org.codehaus.plexus.util.cli.Comm /** * @author <a href="mailto:matpime...@gmail.com">Mateus Pimenta</a> + * @author Olivier Lamy * @since 1.3 + * @version $Id * */ public class VssCheckInCommand extends AbstractCheckInCommand { - /* + /** * (non-Javadoc) * - * @seeorg.apache.maven.scm.command.checkin.AbstractCheckInCommand# executeCheckInCommand + * @see org.apache.maven.scm.command.checkin.AbstractCheckInCommand# executeCheckInCommand * (org.apache.maven.scm.provider.ScmProviderRepository, org.apache.maven.scm.ScmFileSet, * java.lang.String, org.apache.maven.scm.ScmVersion) */ @@ -64,7 +66,7 @@ public class VssCheckInCommand VssScmProviderRepository repo = (VssScmProviderRepository) repository; - List commandLines = buildCmdLine( repo, fileSet, scmVersion ); + List<Commandline> commandLines = buildCmdLine( repo, fileSet, scmVersion ); VssCheckInConsumer consumer = new VssCheckInConsumer( repo, getLogger() ); @@ -74,13 +76,9 @@ public class VssCheckInCommand int exitCode; StringBuffer sb = new StringBuffer(); - List updatedFiles = new ArrayList(); - - for ( Iterator i = commandLines.iterator(); i.hasNext(); ) + for ( Commandline cl : commandLines ) { - Commandline cl = (Commandline) i.next(); - if ( getLogger().isDebugEnabled() ) { getLogger().debug( "Executing: " + cl.getWorkingDirectory().getAbsolutePath() + ">>" + cl.toString() ); @@ -108,15 +106,15 @@ public class VssCheckInCommand } } - return new CheckInScmResult( sb.toString(), updatedFiles ); + return new CheckInScmResult( sb.toString(), new ArrayList<ScmFile>() ); } - public List buildCmdLine( VssScmProviderRepository repo, ScmFileSet fileSet, ScmVersion version ) + public List<Commandline> buildCmdLine( VssScmProviderRepository repo, ScmFileSet fileSet, ScmVersion version ) throws ScmException { - List files = fileSet.getFileList(); - List commands = new ArrayList(); + List<File> files = fileSet.getFileList(); + List<Commandline> commands = new ArrayList<Commandline>(); if ( files.size() > 0 ) { @@ -131,7 +129,7 @@ public class VssCheckInCommand throw new ScmException( "Invalid canonical path", e ); } - for ( Iterator i = files.iterator(); i.hasNext(); ) + for ( File file : files ) { Commandline command = new Commandline(); @@ -153,7 +151,6 @@ public class VssCheckInCommand command.createArg().setValue( VssConstants.COMMAND_CHECKIN ); - File file = (File) i.next(); String absolute; try { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.cv * under the License. */ +import java.io.File; +import java.io.IOException; +import java.util.List; + import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmVersion; @@ -32,12 +36,10 @@ import org.codehaus.plexus.util.FileUtil import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.Commandline; -import java.io.File; -import java.io.IOException; - /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse </a> * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> + * @author Olivier Lamy * @version $Id$ */ public abstract class AbstractCvsCheckInCommand @@ -77,11 +79,11 @@ public abstract class AbstractCvsCheckIn cl.createArg().setValue( messageFile.getAbsolutePath() ); - File[] files = fileSet.getFiles(); + List<File> files = fileSet.getFileList(); - for ( int i = 0; i < files.length; i++ ) + for ( File f : files ) { - cl.createArg().setValue( files[i].getPath().replace( '\\', '/' ) ); + cl.createArg().setValue( f.getPath().replace( '\\', '/' ) ); } if ( getLogger().isInfoEnabled() ) Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java Sun Jan 2 18:40:29 2011 @@ -29,12 +29,13 @@ import java.util.List; /** * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> + * @author Olivier Lamy * @version $Id$ */ public class CvsCheckInConsumer implements StreamConsumer { - private List checkedInFiles = new ArrayList(); + private List<ScmFile> checkedInFiles = new ArrayList<ScmFile>(); private String remotePath; @@ -87,7 +88,7 @@ public class CvsCheckInConsumer checkedInFiles.add( new ScmFile( fileName, ScmFileStatus.CHECKED_IN ) ); } - public List getCheckedInFiles() + public List<ScmFile> getCheckedInFiles() { return checkedInFiles; } 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/checkin/GitCheckInCommand.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/checkin/GitCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&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/checkin/GitCheckInCommand.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/checkin/GitCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -48,6 +48,7 @@ import java.util.List; /** * @author <a href="mailto:strub...@yahoo.de">Mark Struberg</a> + * @author Olivier Lamy * @version $Id$ */ public class GitCheckInCommand @@ -133,12 +134,12 @@ public class GitCheckInCommand } } - List checkedInFiles = new ArrayList( statusConsumer.getChangedFiles().size() ); + List<ScmFile> checkedInFiles = new ArrayList<ScmFile>( statusConsumer.getChangedFiles().size() ); // rewrite all detected files to now have status 'checked_in' - for ( Iterator it = statusConsumer.getChangedFiles().iterator(); it.hasNext(); ) + for ( Iterator<ScmFile> it = statusConsumer.getChangedFiles().iterator(); it.hasNext(); ) { - ScmFile scmfile = new ScmFile( ( (ScmFile) it.next() ).getPath(), ScmFileStatus.CHECKED_IN ); + ScmFile scmfile = new ScmFile( it.next().getPath(), ScmFileStatus.CHECKED_IN ); if ( fileSet.getFileList().isEmpty() ) { @@ -147,9 +148,9 @@ public class GitCheckInCommand else { // if a specific fileSet is given, we have to check if the file is really tracked - for ( Iterator itfl = fileSet.getFileList().iterator(); itfl.hasNext(); ) + for ( Iterator<File> itfl = fileSet.getFileList().iterator(); itfl.hasNext(); ) { - File f = (File) itfl.next(); + File f = itfl.next(); if ( f.toString().equals( scmfile.getPath() ) ) { checkedInFiles.add( scmfile ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java Sun Jan 2 18:40:29 2011 @@ -19,6 +19,12 @@ package org.apache.maven.scm.provider.sv * under the License. */ +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.List; + import org.apache.maven.scm.log.ScmLogger; import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; import org.apache.maven.scm.provider.svn.util.SvnUtil; @@ -29,22 +35,16 @@ import org.codehaus.plexus.util.cli.Comm import org.codehaus.plexus.util.cli.Commandline; import org.codehaus.plexus.util.cli.StreamConsumer; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.Iterator; -import java.util.List; - /** * Command line construction utility. * * @author Brett Porter + * @author Olivier Lamy * @version $Id$ */ public class SvnCommandLineUtils { - public static void addTarget( Commandline cl, List/*<File>*/ files ) + public static void addTarget( Commandline cl, List<File> files ) throws IOException { if ( files == null || files.isEmpty() ) @@ -54,9 +54,8 @@ public class SvnCommandLineUtils StringBuffer sb = new StringBuffer(); String ls = System.getProperty( "line.separator" ); - for ( Iterator i = files.iterator(); i.hasNext(); ) + for ( File f : files ) { - File f = (File) i.next(); sb.append( f.getPath().replace( '\\', '/' ) ); sb.append( ls ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -39,6 +39,7 @@ import java.io.IOException; /** * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> + * @author Olivier Lamy * @version $Id$ */ public class SvnCheckInCommand Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java?rev=1054455&r1=1054454&r2=1054455&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java Sun Jan 2 18:40:29 2011 @@ -29,6 +29,7 @@ import java.util.List; /** * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> + * @author Olivier Lamy * @version $Id$ */ public class SvnCheckInConsumer @@ -106,7 +107,7 @@ public class SvnCheckInConsumer addFile( new ScmFile( file, ScmFileStatus.CHECKED_IN ) ); } - public List getCheckedInFiles() + public List<ScmFile> getCheckedInFiles() { return getFiles(); }