Author: olamy Date: Sun Jan 9 20:10:42 2011 New Revision: 1057015 URL: http://svn.apache.org/viewvc?rev=1057015&view=rev Log: [SCM-591] Move to Java 1.5 : fix some generics warning in cvs providers
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/CvsCommandUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/CvsExeScmProviderTest.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java 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/CvsCommandUtils.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/CvsCommandUtils.java?rev=1057015&r1=1057014&r2=1057015&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/CvsCommandUtils.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/CvsCommandUtils.java Sun Jan 9 20:10:42 2011 @@ -40,6 +40,7 @@ public class CvsCommandUtils { private CvsCommandUtils() { + // noop } public static boolean isCvsNT() @@ -130,7 +131,7 @@ public class CvsCommandUtils if ( settings.getCvsVariables().size() > 0 ) { - for ( Enumeration e = settings.getCvsVariables().propertyNames(); e.hasMoreElements(); ) + for ( Enumeration<?> e = settings.getCvsVariables().propertyNames(); e.hasMoreElements(); ) { String key = (String) e.nextElement(); String value = settings.getCvsVariables().getProperty( key ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java?rev=1057015&r1=1057014&r2=1057015&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java Sun Jan 9 20:10:42 2011 @@ -75,12 +75,12 @@ public class CvsChangeLogConsumerTest s = in.readLine(); } - Collection entries = command.getModifications(); + Collection<ChangeSet> entries = command.getModifications(); assertEquals( "Wrong number of entries returned", 3, entries.size() ); ChangeSet entry = null; - for ( Iterator i = entries.iterator(); i.hasNext(); ) + for ( Iterator<ChangeSet> i = entries.iterator(); i.hasNext(); ) { - entry = (ChangeSet) i.next(); + entry = i.next(); assertTrue( "ChangeLogEntry erroneously picked up", entry.toString().indexOf( "ChangeLogEntry.java" ) == -1 ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java?rev=1057015&r1=1057014&r2=1057015&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java Sun Jan 9 20:10:42 2011 @@ -284,6 +284,8 @@ public class CvsScmProviderRepositoryTes String url = "scm:cvs:pserver:contin...@gnllx002.ebit.be:2401:/data01/cvsroot_bkh:VCG_BKH/uBaseBkh"; ScmRepository repository = scmManager.makeScmRepository( url ); + + assertNotNull( repository ); } // ---------------------------------------------------------------------- Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/CvsExeScmProviderTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/CvsExeScmProviderTest.java?rev=1057015&r1=1057014&r2=1057015&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/CvsExeScmProviderTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/CvsExeScmProviderTest.java Sun Jan 9 20:10:42 2011 @@ -34,7 +34,7 @@ public class CvsExeScmProviderTest { CvsExeScmProvider provider = new CvsExeScmProvider(); - List messages = provider.validateScmUrl( "pserver:cvsserver:/bigrepo:myproject", ':' ); + List<String> messages = provider.validateScmUrl( "pserver:cvsserver:/bigrepo:myproject", ':' ); assertTrue( messages.toString(), messages.isEmpty() ); messages = provider.validateScmUrl( "sserver:cvsserver:/bigrepo:myproject", ':' ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java?rev=1057015&r1=1057014&r2=1057015&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java Sun Jan 9 20:10:42 2011 @@ -56,6 +56,7 @@ public class CvsConnection /** * The path to the repository on the server */ + @SuppressWarnings( "unused" ) private String repository; /** Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java?rev=1057015&r1=1057014&r2=1057015&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java Sun Jan 9 20:10:42 2011 @@ -71,6 +71,7 @@ public class CvsChangeLogCommandTest testChangeLog( startDate, endDate, 22, "1.107.4" ); } + @SuppressWarnings( "deprecation" ) private void testChangeLog( Date startDate, Date endDate, int changeLogSize, String branch ) throws Exception { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java?rev=1057015&r1=1057014&r2=1057015&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java Sun Jan 9 20:10:42 2011 @@ -65,7 +65,7 @@ public class CvsCheckoutCommandTest fail( result.getProviderMessage() + "\n" + result.getCommandOutput() + "\n" + result.getCommandLine() ); } - List files = result.getCheckedOutFiles(); + List<ScmFile> files = result.getCheckedOutFiles(); assertNotNull( files ); @@ -93,6 +93,7 @@ public class CvsCheckoutCommandTest ScmManager scmManager = getScmManager(); + @SuppressWarnings( "deprecation" ) CheckOutScmResult result = scmManager.getProviderByRepository( getScmRepository() ).checkOut( getScmRepository(), getScmFileSet(), "MAVEN_1_0" ); @@ -101,7 +102,7 @@ public class CvsCheckoutCommandTest fail( result.getProviderMessage() + "\n" + result.getCommandOutput() ); } - List files = result.getCheckedOutFiles(); + List<ScmFile> files = result.getCheckedOutFiles(); assertNotNull( files ); @@ -117,14 +118,14 @@ public class CvsCheckoutCommandTest // // ---------------------------------------------------------------------- - private File assertCheckedOutFile( List files, int i, String fileName, ScmFileStatus status ) + private File assertCheckedOutFile( List<ScmFile> files, int i, String fileName, ScmFileStatus status ) throws Exception { File file = new File( getWorkingDirectory(), fileName ); assertTrue( file.getAbsolutePath() + " file doesn't exist.", file.exists() ); - ScmFile coFile = (ScmFile) files.get( i ); + ScmFile coFile = files.get( i ); assertSame( status, coFile.getStatus() );