Author: olamy
Date: Thu Jan 13 23:17:47 2011
New Revision: 1058790
URL: http://svn.apache.org/viewvc?rev=1058790&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in vss provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.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/VssCommandLineUtils.java?rev=1058790&r1=1058789&r2=1058790&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
Thu Jan 13 23:17:47 2011
@@ -51,11 +51,11 @@ public class VssCommandLineUtils
public static void addFiles( Commandline cl, ScmFileSet fileSet )
{
- Iterator it = fileSet.getFileList().iterator();
+ Iterator<File> it = fileSet.getFileList().iterator();
while ( it.hasNext() )
{
- File file = (File) it.next();
+ File file = it.next();
cl.createArg().setValue( file.getPath().replace( '\\', '/' ) );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.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/VssCheckInConsumer.java?rev=1058790&r1=1058789&r2=1058790&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java
Thu Jan 13 23:17:47 2011
@@ -97,7 +97,7 @@ public class VssCheckInConsumer
private String currentPath = "";
- private List updatedFiles = new ArrayList();
+ private List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
private VssScmProviderRepository repo;
@@ -210,7 +210,7 @@ public class VssCheckInConsumer
return argument;
}
- public List getUpdatedFiles()
+ public List<ScmFile> getUpdatedFiles()
{
return updatedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java?rev=1058790&r1=1058789&r2=1058790&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Thu Jan 13 23:17:47 2011
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.vs
* under the License.
*/
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.manager.ScmManager;
@@ -28,10 +32,6 @@ import org.apache.maven.scm.repository.S
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
/**
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
* @version $Id$
@@ -56,8 +56,8 @@ public class VssEditCommandTest
.makeScmRepository( "scm:vss|username|password@C:/Program
File/Visual Source Safe|D:/myProject" );
ScmFileSet fileSet = new ScmFileSet( getTestFile( "target" ) );
VssEditCommand command = new VssEditCommand();
- List commands = command.buildCmdLine( (VssScmProviderRepository)
repository.getProviderRepository(), fileSet );
- Commandline cl = (Commandline) commands.get( 0 );
+ List<Commandline> commands = command.buildCmdLine(
(VssScmProviderRepository) repository.getProviderRepository(), fileSet );
+ Commandline cl = commands.get( 0 );
String ssPath = VssCommandLineUtils.getSsDir().replace( '/',
File.separatorChar );
assertCommandLine( ssPath + "ss Checkout $D:/myProject -R
-Yusername,password -I-", fileSet.getBasedir(), cl );
}
@@ -70,8 +70,8 @@ public class VssEditCommandTest
.makeScmRepository( "scm:vss|username|password@C:/Program
File/Visual Source Safe|D:/myProject" );
ScmFileSet fileSet = new ScmFileSet( target,
"**/target/**/VssEditCommandTest.class" );
VssEditCommand command = new VssEditCommand();
- List commands = command.buildCmdLine( (VssScmProviderRepository)
repository.getProviderRepository(), fileSet );
- Commandline cl = (Commandline) commands.get( 0 );
+ List<Commandline> commands = command.buildCmdLine(
(VssScmProviderRepository) repository.getProviderRepository(), fileSet );
+ Commandline cl =commands.get( 0 );
String ssPath = VssCommandLineUtils.getSsDir().replace( '/',
File.separatorChar );
assertCommandLine(
ssPath
@@ -91,8 +91,8 @@ public class VssEditCommandTest
new File( target,
"test-classes/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.class"
) );
VssEditCommand command = new VssEditCommand();
- List commands = command.buildCmdLine( (VssScmProviderRepository)
repository.getProviderRepository(), fileSet );
- Commandline cl = (Commandline) commands.get( 0 );
+ List<Commandline> commands = command.buildCmdLine(
(VssScmProviderRepository) repository.getProviderRepository(), fileSet );
+ Commandline cl = commands.get( 0 );
String ssPath = VssCommandLineUtils.getSsDir().replace( '/',
File.separatorChar );
assertCommandLine(
ssPath
@@ -112,7 +112,7 @@ public class VssEditCommandTest
"test-classes/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.class"
),
new File( target, "test-classes/META-INF/LICENSE" ) } ) );
VssEditCommand command = new VssEditCommand();
- List commands = command.buildCmdLine( (VssScmProviderRepository)
repository.getProviderRepository(), fileSet );
+ List<Commandline> commands = command.buildCmdLine(
(VssScmProviderRepository) repository.getProviderRepository(), fileSet );
assertEquals( 2, commands.size() );
Commandline cl;
