Author: olamy
Date: Thu Jan 13 22:53:04 2011
New Revision: 1058776
URL: http://svn.apache.org/viewvc?rev=1058776&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in synergy provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.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/util/SynergyCCM.java?rev=1058776&r1=1058775&r2=1058776&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
Thu Jan 13 22:53:04 2011
@@ -192,7 +192,7 @@ public class SynergyCCM
* @return the command line.
* @throws ScmException
*/
- public static Commandline create( List files, String message, String
ccmAddr )
+ public static Commandline create( List<File> files, String message, String
ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -211,9 +211,9 @@ public class SynergyCCM
}
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( Iterator<File> i = files.iterator(); i.hasNext(); )
{
- File f = (File) i.next();
+ File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -311,7 +311,7 @@ public class SynergyCCM
* @return
* @throws ScmException
*/
- public static Commandline delete( List files, String ccmAddr, boolean
replace )
+ public static Commandline delete( List<File> files, String ccmAddr,
boolean replace )
throws ScmException
{
Commandline cl = new Commandline();
@@ -326,9 +326,9 @@ public class SynergyCCM
cl.createArg().setValue( "-replace" );
}
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( Iterator<File> i = files.iterator(); i.hasNext(); )
{
- File f = (File) i.next();
+ File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -508,7 +508,7 @@ public class SynergyCCM
* @return the command line.
* @throws ScmException
*/
- public static Commandline checkoutFiles( List files, String ccmAddr )
+ public static Commandline checkoutFiles( List<File> files, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -518,9 +518,9 @@ public class SynergyCCM
cl.setExecutable( CCM );
cl.createArg().setValue( CO );
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( Iterator<File> i = files.iterator(); i.hasNext(); )
{
- File f = (File) i.next();
+ File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -649,9 +649,9 @@ public class SynergyCCM
if ( files.size() > 0 )
{
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( Iterator<File> i = files.iterator(); i.hasNext(); )
{
- File f = (File) i.next();
+ File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -747,7 +747,8 @@ public class SynergyCCM
{
Properties envVars = CommandLineUtils.getSystemEnvVars();
- for ( Iterator i = envVars.keySet().iterator(); i.hasNext(); )
+ for ( @SuppressWarnings( "rawtypes" )
+ Iterator i = envVars.keySet().iterator(); i.hasNext(); )
{
String key = (String) i.next();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java?rev=1058776&r1=1058775&r2=1058776&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
Thu Jan 13 22:53:04 2011
@@ -55,7 +55,7 @@ public class SynergyGetCompletedTasksCon
s = in.readLine();
}
- Collection entries = consumer.getTasks();
+ Collection<SynergyTask> entries = consumer.getTasks();
assertEquals( "Wrong number of tasks returned", 1, entries.size() );
@@ -92,11 +92,11 @@ public class SynergyGetCompletedTasksCon
s = in.readLine();
}
- Collection entries = consumer.getTasks();
+ Collection<SynergyTask> entries = consumer.getTasks();
assertEquals( "Wrong number of tasks returned", 2, entries.size() );
- Iterator i = entries.iterator();
+ Iterator<SynergyTask> i = entries.iterator();
SynergyTask task = (SynergyTask) i.next();
assertEquals( 52, task.getNumber() );
assertEquals( "ccm_root", task.getUsername() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumerTest.java?rev=1058776&r1=1058775&r2=1058776&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumerTest.java
Thu Jan 13 22:53:04 2011
@@ -53,11 +53,11 @@ public class SynergyGetTaskObjectsConsum
s = in.readLine();
}
- Collection entries = consumer.getFiles();
+ Collection<ChangeFile> entries = consumer.getFiles();
assertEquals( "Wrong number of entries returned", 1, entries.size() );
- ChangeFile file = (ChangeFile) entries.iterator().next();
+ ChangeFile file = entries.iterator().next();
assertEquals( "MessageResources.properties", file.getName() );
assertEquals( "3", file.getRevision() );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java?rev=1058776&r1=1058775&r2=1058776&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
Thu Jan 13 22:53:04 2011
@@ -70,7 +70,7 @@ public class SynergyCCMTest
{
File f = File.createTempFile( "test", null );
f.deleteOnExit();
- List list = new LinkedList();
+ List<File> list = new LinkedList<File>();
list.add( f );
Commandline cl = SynergyCCM.create( list, "test creation", "CCM_ADDR"
);
assertTrue( "CCM_ADDR is not set.", assertContains(
cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
@@ -151,7 +151,7 @@ public class SynergyCCMTest
{
File f = File.createTempFile( "test", null );
f.deleteOnExit();
- List list = new LinkedList();
+ List<File> list = new LinkedList<File>();
list.add( f );
Commandline cl = SynergyCCM.delete( list, "CCM_ADDR", true );
assertTrue( "CCM_ADDR is not set.", assertContains(
cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
@@ -246,7 +246,7 @@ public class SynergyCCMTest
{
File f = File.createTempFile( "test", null );
f.deleteOnExit();
- List list = new LinkedList();
+ List<File> list = new LinkedList<File>();
list.add( f );
Commandline cl = SynergyCCM.checkoutFiles( list, "CCM_ADDR" );
assertTrue( "CCM_ADDR is not set.", assertContains(
cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
@@ -324,7 +324,7 @@ public class SynergyCCMTest
{
File f = File.createTempFile( "test", null );
f.deleteOnExit();
- List list = new LinkedList();
+ List<File> list = new LinkedList<File>();
list.add( f );
Commandline cl = SynergyCCM.checkinFiles( list, "a comment",
"CCM_ADDR" );
assertTrue( "CCM_ADDR is not set.", assertContains(
cl.getEnvironmentVariables(), "CCM_ADDR=CCM_ADDR" ) );
