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/13 23:53:30 UTC
svn commit: r1058777 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src:
main/java/org/apache/maven/scm/provider/tfs/command/
test/java/org/apache/maven/scm/provider/tfs/command/
Author: olamy
Date: Thu Jan 13 22:53:30 2011
New Revision: 1058777
URL: http://svn.apache.org/viewvc?rev=1058777&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in tfs provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java?rev=1058777&r1=1058776&r2=1058777&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java Thu Jan 13 22:53:30 2011
@@ -63,7 +63,7 @@ public class TfsCommand
public void addArgument( ScmFileSet f )
{
info( "files: " + f.getBasedir().getAbsolutePath() );
- Iterator iter = f.getFileList().iterator();
+ Iterator<File> iter = f.getFileList().iterator();
while ( iter.hasNext() )
{
command.createArg().setValue( ( (File) iter.next() ).getPath() );
@@ -97,9 +97,9 @@ public class TfsCommand
if ( out instanceof FileListConsumer )
{
FileListConsumer f = (FileListConsumer) out;
- for ( Iterator i = f.getFiles().iterator(); i.hasNext(); )
+ for ( Iterator<ScmFile> i = f.getFiles().iterator(); i.hasNext(); )
{
- ScmFile file = (ScmFile) i.next();
+ ScmFile file = i.next();
debug( file.getPath() );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java?rev=1058777&r1=1058776&r2=1058777&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java Thu Jan 13 22:53:30 2011
@@ -38,9 +38,9 @@ public class TfsCommandTest
protected String getFileList()
{
String path = "";
- for ( Iterator i = getScmFileSet().getFileList().iterator(); i.hasNext(); )
+ for ( Iterator<File> i = getScmFileSet().getFileList().iterator(); i.hasNext(); )
{
- File f = (File) i.next();
+ File f = i.next();
path += f.getName() + " ";
}
return path.trim();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java?rev=1058777&r1=1058776&r2=1058777&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java Thu Jan 13 22:53:30 2011
@@ -99,7 +99,7 @@ public class TfsStatusCommandTest
consumer.consumeLine( " File type: windows-1252" );
consumer.consumeLine( "" );
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertNotNull( changedFiles );
assertEquals( 4, changedFiles.size() );
assertTrue( changedFiles.contains( new ScmFile( "C:\\temp\\maven\\c4\\.classpath", ScmFileStatus.MODIFIED ) ) );
@@ -129,7 +129,7 @@ public class TfsStatusCommandTest
consumer.consumeLine( " Local item: [SUBHASH-PC] C:\\temp\\maven\\c4\\.project" );
consumer.consumeLine( " File type: windows-1252" );
consumer.consumeLine( "" );
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertNotNull( changedFiles );
assertEquals( 2, changedFiles.size() );
}