Author: olamy
Date: Sun Jan 9 17:23:55 2011
New Revision: 1056980
URL: http://svn.apache.org/viewvc?rev=1056980&view=rev
Log:
[SCM-591] Move to Java 1.5 : update command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.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-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.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/update/AbstractCvsUpdateCommand.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/update/GitUpdateCommandConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -62,7 +62,7 @@ public abstract class AbstractUpdateComm
UpdateScmResult updateScmResult = executeUpdateCommand( repository,
fileSet, scmVersion );
- List filesList = updateScmResult.getUpdatedFiles();
+ List<ScmFile> filesList = updateScmResult.getUpdatedFiles();
if ( !runChangelog )
{
@@ -76,7 +76,7 @@ public abstract class AbstractUpdateComm
ChangeLogScmResult changeLogScmResult =
(ChangeLogScmResult) changeLogCmd.executeCommand( repository,
fileSet, parameters );
- List changes = new ArrayList();
+ List<ChangeSet> changes = new ArrayList<ChangeSet>();
ChangeLogSet changeLogSet = changeLogScmResult.getChangeLog();
@@ -93,9 +93,9 @@ public abstract class AbstractUpdateComm
//Do nothing, startDate isn't define.
}
- for ( Iterator i = changeLogSet.getChangeSets().iterator();
i.hasNext(); )
+ for ( Iterator<ChangeSet> i =
changeLogSet.getChangeSets().iterator(); i.hasNext(); )
{
- ChangeSet change = (ChangeSet) i.next();
+ ChangeSet change = i.next();
if ( startDate != null && change.getDate() != null )
{
@@ -105,11 +105,11 @@ public abstract class AbstractUpdateComm
}
}
- for ( Iterator j = filesList.iterator(); j.hasNext(); )
+ for ( Iterator<ScmFile> j = filesList.iterator();
j.hasNext(); )
{
- ScmFile currentFile = (ScmFile) j.next();
+ ScmFile currentFile = j.next();
- if ( change.containsFilename( currentFile.getPath(),
repository ) )
+ if ( change.containsFilename( currentFile.getPath() ) )
{
changes.add( change );
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
Sun Jan 9 17:23:55 2011
@@ -19,18 +19,23 @@ package org.apache.maven.scm.command.upd
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class UpdateScmResultWithRevision
extends UpdateScmResult
{
+
+ private static final long serialVersionUID = 7644079089026359667L;
private String revision;
public UpdateScmResultWithRevision( String commandLine, String
providerMessage, String commandOutput,
@@ -41,14 +46,14 @@ public class UpdateScmResultWithRevision
this.revision = revision;
}
- public UpdateScmResultWithRevision( String commandLine, List updatedFiles,
String revision )
+ public UpdateScmResultWithRevision( String commandLine, List<ScmFile>
updatedFiles, String revision )
{
super( commandLine, updatedFiles );
this.revision = revision;
}
- public UpdateScmResultWithRevision( List updatedFiles, List changes,
String revision, ScmResult result )
+ public UpdateScmResultWithRevision( List<ScmFile> updatedFiles,
List<ChangeSet> changes, String revision, ScmResult result )
{
super( updatedFiles, changes, result );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.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/diff/BazaarDiffConsumer.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
Sun Jan 9 17:23:55 2011
@@ -68,7 +68,7 @@ public class BazaarDiffConsumer
private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map<String,StringBuilder> differences = new
HashMap<String,StringBuilder>();
+ private Map<String,CharSequence> differences = new
HashMap<String,CharSequence>();
private StringBuffer patch = new StringBuffer();
@@ -182,7 +182,7 @@ public class BazaarDiffConsumer
return changedFiles;
}
- public Map<String,StringBuilder> getDifferences()
+ public Map<String,CharSequence> getDifferences()
{
return differences;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.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/update/BazaarUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -19,6 +19,13 @@ package org.apache.maven.scm.provider.ba
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -38,12 +45,6 @@ import org.apache.maven.scm.provider.baz
import org.apache.maven.scm.provider.bazaar.command.diff.BazaarDiffConsumer;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* @author <a href="mailto:torbj...@smorgrav.org";>Torbj�rn Eikli
Sm�rgrav</a>
* @version $Id$
@@ -84,13 +85,13 @@ public class BazaarUpdateCommand
ScmResult diffResult = BazaarUtils.execute( diffConsumer, getLogger(),
workingDir, diffCmd );
// Now translate between diff and update file status
- List updatedFiles = new ArrayList();
- List changes = new ArrayList();
- List diffFiles = diffConsumer.getChangedFiles();
- Map diffChanges = diffConsumer.getDifferences();
- for ( Iterator it = diffFiles.iterator(); it.hasNext(); )
+ List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
+ List<CharSequence> changes = new ArrayList<CharSequence>();
+ List<ScmFile> diffFiles = diffConsumer.getChangedFiles();
+ Map<String, CharSequence> diffChanges = diffConsumer.getDifferences();
+ for ( Iterator<ScmFile> it = diffFiles.iterator(); it.hasNext(); )
{
- ScmFile file = (ScmFile) it.next();
+ ScmFile file = it.next();
changes.add( diffChanges.get( file ) );
if ( file.getStatus() == ScmFileStatus.MODIFIED )
{
@@ -102,7 +103,7 @@ public class BazaarUpdateCommand
}
}
- return new UpdateScmResultWithRevision( updatedFiles, changes,
String.valueOf( currentRevision ), diffResult );
+ return new UpdateScmResultWithRevision( updatedFiles, new
ArrayList<ChangeSet>(0), String.valueOf( currentRevision ), diffResult );
}
/** {...@inheritdoc} */
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.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/update/ClearCaseUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -36,6 +36,7 @@ import java.io.File;
/**
* @author <a href="mailto:wim.debla...@gmail.com";>Wim Deblauwe</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseUpdateCommand
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.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/update/ClearCaseUpdateConsumer.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
Sun Jan 9 17:23:55 2011
@@ -37,7 +37,7 @@ public class ClearCaseUpdateConsumer
{
private ScmLogger logger;
- private List updatedFiles = new ArrayList();
+ private List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
// ----------------------------------------------------------------------
//
@@ -74,7 +74,7 @@ public class ClearCaseUpdateConsumer
//
// ----------------------------------------------------------------------
- public List getUpdatedFiles()
+ public List<ScmFile> getUpdatedFiles()
{
return updatedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.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/diff/HgDiffConsumer.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
Sun Jan 9 17:23:55 2011
@@ -69,7 +69,7 @@ public class HgDiffConsumer
private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map<String,StringBuilder> differences = new
HashMap<String,StringBuilder>();
+ private Map<String,CharSequence> differences = new
HashMap<String,CharSequence>();
private StringBuffer patch = new StringBuffer();
@@ -160,7 +160,7 @@ public class HgDiffConsumer
return changedFiles;
}
- public Map<String,StringBuilder> getDifferences()
+ public Map<String,CharSequence> getDifferences()
{
return differences;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.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/update/HgUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -21,10 +21,10 @@ package org.apache.maven.scm.provider.hg
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -46,6 +46,7 @@ import org.codehaus.plexus.util.StringUt
/**
* @author <a href="mailto:thurner.rup...@ymono.net";>thurner rupert</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class HgUpdateCommand
@@ -81,13 +82,12 @@ public class HgUpdateCommand
ScmResult diffResult = HgUtils.execute( diffConsumer, getLogger(),
workingDir, diffCmd );
// Now translate between diff and update file status
- List updatedFiles = new ArrayList();
- List changes = new ArrayList();
- List diffFiles = diffConsumer.getChangedFiles();
- Map diffChanges = diffConsumer.getDifferences();
- for ( Iterator it = diffFiles.iterator(); it.hasNext(); )
+ List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
+ List<CharSequence> changes = new ArrayList<CharSequence>();
+ List<ScmFile> diffFiles = diffConsumer.getChangedFiles();
+ Map<String, CharSequence> diffChanges = diffConsumer.getDifferences();
+ for ( ScmFile file : diffFiles )
{
- ScmFile file = (ScmFile) it.next();
changes.add( diffChanges.get( file.getPath() ) );
if ( file.getStatus() == ScmFileStatus.MODIFIED )
{
@@ -102,7 +102,7 @@ public class HgUpdateCommand
String[] hgUpdateCmd = new String[] { HgCommandConstants.UPDATE_CMD };
HgUtils.execute( new HgConsumer( getLogger() ), getLogger(),
workingDir, hgUpdateCmd );
- return new UpdateScmResultWithRevision( updatedFiles, changes,
String.valueOf( currentRevision ), diffResult );
+ return new UpdateScmResultWithRevision( updatedFiles, new
ArrayList<ChangeSet>(0), String.valueOf( currentRevision ), diffResult );
}
protected ChangeLogCommand getChangeLogCommand()
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml Sun
Jan 9 17:23:55 2011
@@ -63,6 +63,7 @@
</executions>
<configuration>
<version>1.0.0</version>
+ <useJava5>true</useJava5>
<models>
<model>src/main/mdo/maven-scm-local-metadata.mdo</model>
</models>
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.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/update/LocalUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -43,6 +43,7 @@ import java.util.List;
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class LocalUpdateCommand
@@ -90,7 +91,7 @@ public class LocalUpdateCommand
+ baseDestination.getAbsolutePath() + ")." );
}
- List updatedFiles;
+ List<ScmFile> updatedFiles;
try
{
@@ -101,9 +102,10 @@ public class LocalUpdateCommand
+ source.getAbsolutePath() + "'." );
}
- List fileList = FileUtils.getFiles( source.getAbsoluteFile(),
"**", null );
-
- updatedFiles = update( source, baseDestination, fileList );
+ @SuppressWarnings( "unchecked" )
+ List<File> fileList = FileUtils.getFiles(
source.getAbsoluteFile(), "**", null );
+ List<File> list = fileList;
+ updatedFiles = update( source, baseDestination, list );
// process deletions in repository
LocalScmMetadataUtils metadataUtils = new LocalScmMetadataUtils(
getLogger() );
@@ -111,9 +113,9 @@ public class LocalUpdateCommand
if ( originalMetadata != null )
{
LocalScmMetadata newMetadata = metadataUtils.buildMetadata(
source );
- for ( Iterator it =
originalMetadata.getRepositoryFileNames().iterator(); it.hasNext(); )
+ for ( Iterator<String> it =
originalMetadata.getRepositoryFileNames().iterator(); it.hasNext(); )
{
- String filename = (String) it.next();
+ String filename = it.next();
if ( !newMetadata.getRepositoryFileNames().contains(
filename ) )
{
File localFile = new File( baseDestination, filename );
@@ -138,16 +140,16 @@ public class LocalUpdateCommand
return new LocalUpdateScmResult( null, updatedFiles );
}
- private List update( File source, File baseDestination, List files )
+ private List<ScmFile> update( File source, File baseDestination,
List<File> files )
throws ScmException, IOException
{
String sourcePath = source.getAbsolutePath();
- List updatedFiles = new ArrayList();
+ List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( Iterator<File> i = files.iterator(); i.hasNext(); )
{
- File repositoryFile = (File) i.next();
+ File repositoryFile = i.next();
File repositoryDirectory = repositoryFile.getParentFile();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.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/update/PerforceUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -74,6 +74,7 @@ public class PerforceUpdateCommand
String clientspec = PerforceScmProvider.getClientspecName(
getLogger(), p4repo, files.getBasedir() );
Commandline cl = createCommandLine( p4repo, files.getBasedir(),
clientspec );
+ @SuppressWarnings( "unused" )
String location = PerforceScmProvider.getRepoPath( getLogger(),
p4repo, files.getBasedir() );
PerforceHaveConsumer consumer =
new PerforceHaveConsumer( getLogger() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.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/update/StarteamUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -68,7 +68,7 @@ public class StarteamUpdateCommand
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
- List updateFiles = fileSet.getFileList();
+ List<File> updateFiles = fileSet.getFileList();
if ( updateFiles.size() == 0 )
{
@@ -123,7 +123,7 @@ public class StarteamUpdateCommand
public static Commandline createCommandLine( StarteamScmProviderRepository
repo, ScmFileSet fileSet,
ScmVersion version )
{
- List args = new ArrayList();
+ List<String> args = new ArrayList<String>();
args.add( "-merge" );
args.add( "-neverprompt" );
@@ -174,7 +174,7 @@ public class StarteamUpdateCommand
public static Commandline createDeleteLocalCommand(
StarteamScmProviderRepository repo, ScmFileSet dir,
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-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=1056980&r1=1056979&r2=1056980&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
Sun Jan 9 17:23:55 2011
@@ -83,7 +83,7 @@ public class SynergyUpdateCommand
File source = new File( waPath, repo.getProjectName() );
// Move file from work area to expected dir if not the same
- List modifications = new ArrayList();
+ List<ScmFile> modifications = new ArrayList<ScmFile>();
if ( !source.equals( fileSet.getBasedir() ) )
{
if ( getLogger().isInfoEnabled() )
@@ -126,7 +126,7 @@ public class SynergyUpdateCommand
* @param destinationDirectory
* @throws IOException
*/
- public static void copyDirectoryStructure( File sourceDirectory, File
destinationDirectory, List modifications )
+ public static void copyDirectoryStructure( File sourceDirectory, File
destinationDirectory, List<ScmFile> modifications )
throws IOException
{
if ( !sourceDirectory.exists() )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.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/update/VssUpdateConsumer.java?rev=1056980&r1=1056979&r2=1056980&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.java
Sun Jan 9 17:23:55 2011
@@ -96,7 +96,7 @@ public class VssUpdateConsumer
private String currentPath = "";
- private List updatedFiles = new ArrayList();
+ private List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
private VssScmProviderRepository repo;
@@ -225,7 +225,7 @@ public class VssUpdateConsumer
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/update/AbstractCvsUpdateCommand.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/update/AbstractCvsUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&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/update/AbstractCvsUpdateCommand.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/update/AbstractCvsUpdateCommand.java
Sun Jan 9 17:23:55 2011
@@ -38,6 +38,7 @@ import org.codehaus.plexus.util.cli.Comm
/**
* @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 AbstractCvsUpdateCommand
@@ -59,10 +60,10 @@ public abstract class AbstractCvsUpdateC
cl.createArg().setValue( "-r" + version.getName() );
}
- List files = fileSet.getFileList();
+ List<File> files = fileSet.getFileList();
if ( !files.isEmpty() )
{
- Iterator fileIterator = files.iterator();
+ Iterator<File> fileIterator = files.iterator();
while ( fileIterator.hasNext() )
{
cl.createArg().setValue( ( (File) fileIterator.next()
).getPath() );
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/update/GitUpdateCommandConsumer.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/update/GitUpdateCommandConsumer.java?rev=1056980&r1=1056979&r2=1056980&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/update/GitUpdateCommandConsumer.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/update/GitUpdateCommandConsumer.java
Sun Jan 9 17:23:55 2011
@@ -43,7 +43,7 @@ public class GitUpdateCommandConsumer
private boolean summaryFound;
- private Map scmFiles = new LinkedHashMap();
+ private Map<String, ScmFile> scmFiles = new LinkedHashMap<String,
ScmFile>();
public GitUpdateCommandConsumer( ScmLogger logger, File workingDirectory )
{
@@ -130,12 +130,12 @@ public class GitUpdateCommandConsumer
}
}
- public List getUpdatedFiles()
+ public List<ScmFile> getUpdatedFiles()
{
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( " updatedFiles size " + scmFiles.size() );
}
- return new ArrayList( scmFiles.values() );
+ return new ArrayList<ScmFile>( scmFiles.values() );
}
}
