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 2011/01/03 21:40:40 UTC
svn commit: r1054738 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/
maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/
maven-scm-providers/maven-...
Author: olamy
Date: Mon Jan 3 20:40:39 2011
New Revision: 1054738
URL: http://svn.apache.org/viewvc?rev=1054738&view=rev
Log:
[SCM-591] move to Java 1.5 : checkout command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.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-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.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/checkout/CvsCheckOutConsumer.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/checkout/SvnCheckOutCommand.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/checkout/SvnCheckOutConsumer.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java Mon Jan 3 20:40:39 2011
@@ -31,6 +31,7 @@ import org.apache.maven.scm.provider.Scm
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public abstract class AbstractCheckOutCommand
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java Mon Jan 3 20:40:39 2011
@@ -19,20 +19,24 @@ package org.apache.maven.scm.command.che
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class CheckOutScmResult
extends ScmResult
{
- private List checkedOutFiles;
+ private static final long serialVersionUID = 3345964619749320210L;
+
+ private List<ScmFile> checkedOutFiles;
/**
* The relative path of the directory of the checked out project in comparison to the checkout directory, or
@@ -51,14 +55,14 @@ public class CheckOutScmResult
super( commandLine, providerMessage, commandOutput, success );
}
- public CheckOutScmResult( String commandLine, List checkedOutFiles )
+ public CheckOutScmResult( String commandLine, List<ScmFile> checkedOutFiles )
{
super( commandLine, null, null, true );
this.checkedOutFiles = checkedOutFiles;
}
- public CheckOutScmResult( String commandLine, List checkedOutFiles, String relativePathProjectDirectory )
+ public CheckOutScmResult( String commandLine, List<ScmFile> checkedOutFiles, String relativePathProjectDirectory )
{
this( commandLine, checkedOutFiles );
@@ -68,14 +72,14 @@ public class CheckOutScmResult
}
}
- public CheckOutScmResult( List checkedOutFiles, ScmResult result )
+ public CheckOutScmResult( List<ScmFile> checkedOutFiles, ScmResult result )
{
super( result );
this.checkedOutFiles = checkedOutFiles;
}
- public List getCheckedOutFiles()
+ public List<ScmFile> getCheckedOutFiles()
{
return checkedOutFiles;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.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/checkout/BazaarCheckOutCommand.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java Mon Jan 3 20:40:39 2011
@@ -19,6 +19,11 @@ package org.apache.maven.scm.provider.ba
* 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.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -33,12 +38,9 @@ import org.apache.maven.scm.provider.baz
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class BazaarCheckOutCommand
@@ -67,7 +69,7 @@ public class BazaarCheckOutCommand
}
// Do the actual checkout
- ArrayList checkoutCmd = new ArrayList();
+ List<String> checkoutCmd = new ArrayList<String>();
checkoutCmd.add( BazaarConstants.BRANCH_CMD );
checkoutCmd.add( url );
checkoutCmd.add( checkoutDir.getAbsolutePath() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutConsumer.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/checkout/BazaarCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -29,7 +29,8 @@ import java.util.ArrayList;
import java.util.List;
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class BazaarCheckOutConsumer
@@ -38,7 +39,7 @@ public class BazaarCheckOutConsumer
private final File workingDirectory;
- private final ArrayList checkedOut = new ArrayList();
+ private final List<ScmFile> checkedOut = new ArrayList<ScmFile>();
public BazaarCheckOutConsumer( ScmLogger logger, File workingDirectory )
{
@@ -56,7 +57,7 @@ public class BazaarCheckOutConsumer
}
}
- List getCheckedOutFiles()
+ public List<ScmFile> getCheckedOutFiles()
{
return checkedOut;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutConsumer.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/checkout/ClearCaseCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -29,6 +29,7 @@ import java.util.List;
/**
* @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseCheckOutConsumer
@@ -36,7 +37,7 @@ public class ClearCaseCheckOutConsumer
{
private ScmLogger logger;
- private List checkedOutFiles = new ArrayList();
+ private List<ScmFile> checkedOutFiles = new ArrayList<ScmFile>();
// ----------------------------------------------------------------------
//
@@ -54,6 +55,10 @@ public class ClearCaseCheckOutConsumer
/** {@inheritDoc} */
public void consumeLine( String line )
{
+ if (logger.isDebugEnabled())
+ {
+ logger.debug( "line " + line );
+ }
checkedOutFiles.add( new ScmFile( line, ScmFileStatus.CHECKED_OUT ) );
}
@@ -61,7 +66,7 @@ public class ClearCaseCheckOutConsumer
//
// ----------------------------------------------------------------------
- public List getCheckedOutFiles()
+ public List<ScmFile> getCheckedOutFiles()
{
return checkedOutFiles;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.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/checkout/HgCheckOutCommand.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java Mon Jan 3 20:40:39 2011
@@ -39,6 +39,7 @@ import java.io.IOException;
/**
* @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class HgCheckOutCommand
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.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/checkout/HgCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -30,6 +30,7 @@ import java.util.List;
/**
* @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class HgCheckOutConsumer
@@ -38,7 +39,7 @@ public class HgCheckOutConsumer
private final File workingDirectory;
- private final ArrayList checkedOut = new ArrayList();
+ private List<ScmFile> checkedOut = new ArrayList<ScmFile>();
public HgCheckOutConsumer( ScmLogger logger, File workingDirectory )
{
@@ -56,7 +57,7 @@ public class HgCheckOutConsumer
}
}
- List getCheckedOutFiles()
+ List<ScmFile> getCheckedOutFiles()
{
return checkedOut;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.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/checkout/LocalCheckOutCommand.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java Mon Jan 3 20:40:39 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.apache.maven.scm.provider.local.repository.LocalScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;
-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:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -77,7 +75,7 @@ public class LocalCheckOutCommand
throw new ScmException( "The module directory doesn't exist (" + source.getAbsolutePath() + ")." );
}
- List checkedOutFiles;
+ List<ScmFile> checkedOutFiles;
try
{
@@ -99,15 +97,17 @@ public class LocalCheckOutCommand
+ baseDestination.getAbsolutePath() + "'." );
}
- List fileList;
+ List<File> fileList;
- if ( fileSet.getFiles().length == 0 )
+ if ( fileSet.getFileList().isEmpty() )
{
- fileList = FileUtils.getFiles( source.getAbsoluteFile(), "**", null );
+ @SuppressWarnings( "unchecked" )
+ List<File> files = FileUtils.getFiles( source.getAbsoluteFile(), "**", null );
+ fileList = files;
}
else
{
- fileList = Arrays.asList( fileSet.getFiles() );
+ fileList = fileSet.getFileList();
}
checkedOutFiles = checkOut( source, baseDestination, fileList, repository.getModule() );
@@ -124,17 +124,15 @@ public class LocalCheckOutCommand
return new LocalCheckOutScmResult( null, checkedOutFiles );
}
- private List checkOut( File source, File baseDestination, List files, String module )
+ private List<ScmFile> checkOut( File source, File baseDestination, List<File> files, String module )
throws ScmException, IOException
{
String sourcePath = source.getAbsolutePath();
- List checkedOutFiles = new ArrayList();
+ List<ScmFile> checkedOutFiles = new ArrayList<ScmFile>();
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( File file : files )
{
- File file = (File) i.next();
-
String dest = file.getAbsolutePath();
dest = dest.substring( sourcePath.length() + 1 );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.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/checkout/PerforceCheckOutCommand.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java Mon Jan 3 20:40:39 2011
@@ -20,10 +20,10 @@ package org.apache.maven.scm.provider.pe
*/
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.StringBufferInputStream;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -34,19 +34,12 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.provider.perforce.PerforceScmProvider;
import org.apache.maven.scm.provider.perforce.command.PerforceCommand;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
+import org.apache.regexp.RE;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import org.apache.regexp.RE;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringBufferInputStream;
-
/**
* @author Mike Perham
* @version $Id$
@@ -107,7 +100,7 @@ public class PerforceCheckOutCommand
}
CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
- int exitCode = CommandLineUtils.executeCommandLine( cl, new StringBufferInputStream(client), consumer, err );
+ int exitCode = CommandLineUtils.executeCommandLine( cl, new ByteArrayInputStream(client.getBytes()), consumer, err );
if ( exitCode != 0 )
{
@@ -137,7 +130,7 @@ public class PerforceCheckOutCommand
{
try
{
- int lastChangelist = getLastChangelist( prepo, workingDirectory, specname );
+ getLastChangelist( prepo, workingDirectory, specname );
cl = createCommandLine( prepo, workingDirectory, version, specname );
if ( getLogger().isDebugEnabled() )
{
@@ -304,11 +297,11 @@ public class PerforceCheckOutCommand
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "-c" + specname );
- command.createArgument().setValue( "changes" );
- command.createArgument().setValue( "-m1" );
- command.createArgument().setValue( "-ssubmitted" );
- command.createArgument().setValue( "//" + specname + "/..." );
+ command.createArg().setValue( "-c" + specname );
+ command.createArg().setValue( "changes" );
+ command.createArg().setValue( "-m1" );
+ command.createArg().setValue( "-ssubmitted" );
+ command.createArg().setValue( "//" + specname + "/..." );
getLogger().debug( "Executing: " + PerforceScmProvider.clean( command.toString() ) );
Process proc = command.execute();
BufferedReader br = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.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/checkout/PerforceCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -48,7 +48,7 @@ public class PerforceCheckOutConsumer
private RE fileRegexp = new RE( "([^#]+)#\\d+ - ([a-z]+)" );
- private List checkedout = new ArrayList();
+ private List<ScmFile> checkedout = new ArrayList<ScmFile>();
private String repo = null;
@@ -131,7 +131,7 @@ public class PerforceCheckOutConsumer
return currentState == STATE_NORMAL;
}
- public List getCheckedout()
+ public List<ScmFile> getCheckedout()
{
return checkedout;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.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/checkout/StarteamCheckOutCommand.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java Mon Jan 3 20:40:39 2011
@@ -38,6 +38,7 @@ import java.util.List;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class StarteamCheckOutCommand
@@ -88,7 +89,7 @@ public class StarteamCheckOutCommand
public static Commandline createCommandLine( StarteamScmProviderRepository repo, ScmFileSet baseDir,
ScmVersion version )
{
- List args = new ArrayList();
+ List<String> args = new ArrayList<String>();
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.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/checkout/StarteamCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -31,6 +31,7 @@ import java.util.List;
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class StarteamCheckOutConsumer
@@ -42,7 +43,7 @@ public class StarteamCheckOutConsumer
private String currentDir = "";
- private List files = new ArrayList();
+ private List<ScmFile> files = new ArrayList<ScmFile>();
/**
* Marks current directory data
@@ -101,7 +102,7 @@ public class StarteamCheckOutConsumer
}
}
- public List getCheckedOutFiles()
+ public List<ScmFile> getCheckedOutFiles()
{
return files;
}
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=1054738&r1=1054737&r2=1054738&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 Mon Jan 3 20:40:39 2011
@@ -19,8 +19,15 @@ package org.apache.maven.scm.provider.sy
* 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;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.command.checkout.AbstractCheckOutCommand;
@@ -31,10 +38,6 @@ import org.apache.maven.scm.provider.syn
import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
/**
* @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
* @version $Id$
@@ -126,10 +129,15 @@ public class SynergyCheckOutCommand
}
// We need to list files in the directory
- List files;
+ List<ScmFile> files = new ArrayList<ScmFile>();
try
{
- files = FileUtils.getFiles( fileSet.getBasedir(), null, "_ccmwaid.inf" );
+ @SuppressWarnings( "unchecked" )
+ List<File> realFiles = FileUtils.getFiles( fileSet.getBasedir(), null, "_ccmwaid.inf" );
+ for (File f : realFiles)
+ {
+ files.add( new ScmFile( f.getPath(), ScmFileStatus.CHECKED_OUT ) );
+ }
}
catch ( IOException e )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.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/checkout/VssCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -96,7 +96,7 @@ public class VssCheckOutConsumer
private String currentPath = "";
- private List updatedFiles = new ArrayList();
+ private List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
private VssScmProviderRepository repo;
@@ -209,7 +209,7 @@ public class VssCheckOutConsumer
return argument;
}
- public List getUpdatedFiles()
+ public List<ScmFile> getUpdatedFiles()
{
return updatedFiles;
}
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/checkout/CvsCheckOutConsumer.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/checkout/CvsCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&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/checkout/CvsCheckOutConsumer.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/checkout/CvsCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -30,6 +30,7 @@ import java.util.List;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class CvsCheckOutConsumer
@@ -37,7 +38,7 @@ public class CvsCheckOutConsumer
{
private ScmLogger logger;
- private List files = new ArrayList();
+ private List<ScmFile> files = new ArrayList<ScmFile>();
public CvsCheckOutConsumer( ScmLogger logger )
{
@@ -92,7 +93,7 @@ public class CvsCheckOutConsumer
}
}
- public List getCheckedOutFiles()
+ public List<ScmFile> getCheckedOutFiles()
{
return files;
}
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/checkout/SvnCheckOutCommand.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/checkout/SvnCheckOutCommand.java?rev=1054738&r1=1054737&r2=1054738&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/checkout/SvnCheckOutCommand.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/checkout/SvnCheckOutCommand.java Mon Jan 3 20:40:39 2011
@@ -42,6 +42,7 @@ import java.io.File;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SvnCheckOutCommand
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/checkout/SvnCheckOutConsumer.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/checkout/SvnCheckOutConsumer.java?rev=1054738&r1=1054737&r2=1054738&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/checkout/SvnCheckOutConsumer.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/checkout/SvnCheckOutConsumer.java Mon Jan 3 20:40:39 2011
@@ -19,18 +19,18 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.svn.svnexe.command.AbstractFileCheckingConsumer;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SvnCheckOutConsumer
@@ -38,7 +38,7 @@ public class SvnCheckOutConsumer
{
private static final String CHECKED_OUT_REVISION_TOKEN = "Checked out revision";
- private List files = new ArrayList();
+ private List<ScmFile> files = new ArrayList<ScmFile>();
public SvnCheckOutConsumer( ScmLogger logger, File workingDirectory )
{
@@ -84,7 +84,7 @@ public class SvnCheckOutConsumer
//
// ----------------------------------------------------------------------
- public List getCheckedOutFiles()
+ public List<ScmFile> getCheckedOutFiles()
{
return getFiles();
}
@@ -94,13 +94,11 @@ public class SvnCheckOutConsumer
files.add( file );
}
- protected List getFiles()
+ protected List<ScmFile> getFiles()
{
- List onlyFiles = new ArrayList();
- for ( Iterator it = files.iterator(); it.hasNext(); )
+ List<ScmFile> onlyFiles = new ArrayList<ScmFile>();
+ for ( ScmFile file : files )
{
- ScmFile file = (ScmFile) it.next();
-
if (!( !file.getStatus().equals( ScmFileStatus.DELETED )
&& !new File( file.getPath() ).isFile() ))
{