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/09 21:09:47 UTC
svn commit: r1057014 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src:
main/java/org/apache/maven/scm/provider/clearcase/command/tag/
main/java/org/apache/maven/scm/provider/clearcase/repository/
test/java/org/apache/maven/scm...
Author: olamy
Date: Sun Jan 9 20:09:47 2011
New Revision: 1057014
URL: http://svn.apache.org/viewvc?rev=1057014&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in clearcase provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.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/tag/ClearCaseTagConsumer.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java Sun Jan 9 20:09:47 2011
@@ -36,7 +36,7 @@ public class ClearCaseTagConsumer
{
private ScmLogger logger;
- private List taggedFiles = new ArrayList();
+ private List<ScmFile> taggedFiles = new ArrayList<ScmFile>();
// ----------------------------------------------------------------------
//
@@ -78,7 +78,7 @@ public class ClearCaseTagConsumer
//
// ----------------------------------------------------------------------
- public List getTaggedFiles()
+ public List<ScmFile> getTaggedFiles()
{
return taggedFiles;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.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/repository/ClearCaseScmProviderRepository.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java Sun Jan 9 20:09:47 2011
@@ -201,7 +201,6 @@ public class ClearCaseScmProviderReposit
throws UnknownHostException, MalformedURLException
{
int tokenNumber = tokenizer.countTokens();
- String directory;
if ( tokenNumber <= 2 )
{
throw new MalformedURLException( "ClearCaseUCM need more parameters. Expected url format : "
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java Sun Jan 9 20:09:47 2011
@@ -54,11 +54,11 @@ public class ClearCaseAddConsumerTest
s = in.readLine();
}
- Collection entries = consumer.getAddedFiles();
+ Collection<ScmFile> entries = consumer.getAddedFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
- ScmFile scmFile = (ScmFile) entries.iterator().next();
+ ScmFile scmFile = entries.iterator().next();
assertEquals( "test.java", scmFile.getPath() );
assertEquals( ScmFileStatus.ADDED, scmFile.getStatus() );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java Sun Jan 9 20:09:47 2011
@@ -54,11 +54,11 @@ public class ClearCaseCheckInConsumerTes
s = in.readLine();
}
- Collection entries = consumer.getCheckedInFiles();
+ Collection<ScmFile> entries = consumer.getCheckedInFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
- ScmFile scmFile = (ScmFile) entries.iterator().next();
+ ScmFile scmFile = entries.iterator().next();
assertEquals( "test.java", scmFile.getPath() );
assertEquals( ScmFileStatus.CHECKED_IN, scmFile.getStatus() );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java Sun Jan 9 20:09:47 2011
@@ -54,11 +54,11 @@ public class ClearCaseRemoveConsumerTest
s = in.readLine();
}
- Collection entries = consumer.getRemovedFiles();
+ Collection<ScmFile> entries = consumer.getRemovedFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
- ScmFile scmFile = (ScmFile) entries.iterator().next();
+ ScmFile scmFile = entries.iterator().next();
assertEquals( "test.java", scmFile.getPath() );
assertEquals( ScmFileStatus.DELETED, scmFile.getStatus() );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java Sun Jan 9 20:09:47 2011
@@ -56,11 +56,11 @@ public class ClearCaseStatusConsumerTest
s = in.readLine();
}
- Collection entries = consumer.getCheckedOutFiles();
+ Collection<ScmFile> entries = consumer.getCheckedOutFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
- ScmFile scmFile = (ScmFile) entries.iterator().next();
+ ScmFile scmFile = entries.iterator().next();
String scmFilePath = StringUtils.replace( scmFile.getPath(), "\\", File.separator );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java Sun Jan 9 20:09:47 2011
@@ -54,11 +54,11 @@ public class ClearCaseTagConsumerTest
s = in.readLine();
}
- Collection entries = consumer.getTaggedFiles();
+ Collection<ScmFile> entries = consumer.getTaggedFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
- ScmFile scmFile = (ScmFile) entries.iterator().next();
+ ScmFile scmFile = entries.iterator().next();
assertEquals( "test.java", scmFile.getPath() );
assertEquals( ScmFileStatus.TAGGED, scmFile.getStatus() );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java Sun Jan 9 20:09:47 2011
@@ -54,11 +54,11 @@ public class ClearCaseUnEditConsumerTest
s = in.readLine();
}
- Collection entries = consumer.getUnEditFiles();
+ Collection<ScmFile> entries = consumer.getUnEditFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
- ScmFile scmFile = (ScmFile) entries.iterator().next();
+ ScmFile scmFile = entries.iterator().next();
assertEquals( "test.java", scmFile.getPath() );
assertEquals( ScmFileStatus.UNKNOWN, scmFile.getStatus() );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java Sun Jan 9 20:09:47 2011
@@ -78,11 +78,11 @@ public class ClearCaseUpdateConsumerTest
}
String message = "locale is \"" + locale.getLanguage() + "\"";
- Collection entries = consumer.getUpdatedFiles();
+ Collection<ScmFile> entries = consumer.getUpdatedFiles();
assertEquals( message + " Wrong number of entries returned", 1, entries.size() );
- ScmFile scmFile = (ScmFile) entries.iterator().next();
+ ScmFile scmFile = entries.iterator().next();
assertEquals( message, "my_vob\\modules\\utils\\utils-logging-jar\\testfile.txt", scmFile.getPath() );
assertEquals( message, ScmFileStatus.UPDATED, scmFile.getStatus() );
}