Author: olamy Date: Sun Jan 9 20:11:55 2011 New Revision: 1057017 URL: http://svn.apache.org/viewvc?rev=1057017&view=rev Log: [SCM-591] Move to Java 1.5 : fix some generics warning in hg provider
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgChangeSet.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java Sun Jan 9 20:11:55 2011 @@ -72,7 +72,7 @@ public class HgScmProvider private static class HgUrlParserResult { - private List messages = new ArrayList(); + private List<String> messages = new ArrayList<String>(); private ScmProviderRepository repository; } @@ -132,9 +132,8 @@ public class HgScmProvider { try { - + @SuppressWarnings( "unused" ) File file = new File( url ); - } catch ( Throwable e ) { @@ -170,7 +169,7 @@ public class HgScmProvider } /** {...@inheritdoc} */ - public List validateScmUrl( String scmSpecificUrl, char delimiter ) + public List<String> validateScmUrl( String scmSpecificUrl, char delimiter ) { HgUrlParserResult result = parseScmUrl( scmSpecificUrl ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java Sun Jan 9 20:11:55 2011 @@ -51,12 +51,12 @@ public class HgUtils /** * Map between command and its valid exit codes */ - private static final Map EXIT_CODE_MAP = new HashMap(); + private static final Map<String,List<Integer>> EXIT_CODE_MAP = new HashMap<String,List<Integer>>(); /** * Default exit codes for entries not in exitCodeMap */ - private static final List DEFAULT_EXIT_CODES = new ArrayList(); + private static final List<Integer> DEFAULT_EXIT_CODES = new ArrayList<Integer>(); /** Setup exit codes*/ static @@ -64,13 +64,13 @@ public class HgUtils DEFAULT_EXIT_CODES.add( new Integer( 0 ) ); //Diff is different - List diffExitCodes = new ArrayList(); - diffExitCodes.add( new Integer( 0 ) ); //No difference - diffExitCodes.add( new Integer( 1 ) ); //Conflicts in merge-like or changes in diff-like - diffExitCodes.add( new Integer( 2 ) ); //Unrepresentable diff changes + List<Integer> diffExitCodes = new ArrayList<Integer>( 3 ); + diffExitCodes.add( Integer.valueOf( 0 ) ); //No difference + diffExitCodes.add( Integer.valueOf( 1 ) ); //Conflicts in merge-like or changes in diff-like + diffExitCodes.add( Integer.valueOf( 2 ) ); //Unrepresentable diff changes EXIT_CODE_MAP.put( HgCommandConstants.DIFF_CMD, diffExitCodes ); //Outgoing is different - List outgoingExitCodes = new ArrayList( ); + List<Integer> outgoingExitCodes = new ArrayList<Integer>( 2 ); outgoingExitCodes.add( new Integer( 0 ) ); //There are changes outgoingExitCodes.add( new Integer( 1 ) ); //No changes EXIT_CODE_MAP.put( HgCommandConstants.OUTGOING_CMD, outgoingExitCodes ); @@ -92,10 +92,10 @@ public class HgUtils int exitCode = executeCmd( consumer, cmd ); //Return result - List exitCodes = DEFAULT_EXIT_CODES; + List<Integer> exitCodes = DEFAULT_EXIT_CODES; if ( EXIT_CODE_MAP.containsKey( cmdAndArgs[0] ) ) { - exitCodes = (List) EXIT_CODE_MAP.get( cmdAndArgs[0] ); + exitCodes = EXIT_CODE_MAP.get( cmdAndArgs[0] ); } boolean success = exitCodes.contains( new Integer( exitCode ) ); @@ -181,7 +181,7 @@ public class HgUtils public static String[] expandCommandLine( String[] cmdAndArgs, ScmFileSet additionalFiles ) { - List filesList = additionalFiles.getFileList(); + List<File> filesList = additionalFiles.getFileList(); String[] cmd = new String[filesList.size() + cmdAndArgs.length]; // Copy command into array @@ -189,7 +189,7 @@ public class HgUtils // Add files as additional parameter into the array int i = 0; - for ( Iterator iterator = filesList.iterator(); iterator.hasNext(); i++ ) + for ( Iterator<File> iterator = filesList.iterator(); iterator.hasNext(); i++ ) { File scmFile = (File) iterator.next(); String file = scmFile.getPath().replace( '\\', File.separatorChar ); @@ -299,12 +299,12 @@ public class HgUtils String[] outCmd = new String[]{ HgCommandConstants.OUTGOING_CMD }; HgOutgoingConsumer outConsumer = new HgOutgoingConsumer( logger ); ScmResult outResult = HgUtils.execute( outConsumer, logger, workingDir, outCmd ); - List changes = outConsumer.getChanges(); + List<HgChangeSet> changes = outConsumer.getChanges(); if ( outResult.isSuccess() ) { for ( int i = 0; i < changes.size(); i++ ) { - HgChangeSet set = (HgChangeSet) changes.get( i ); + HgChangeSet set = changes.get( i ); if ( set.getBranch() != null ) { logger.warn( "A different branch than " + workingbranchName + Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java Sun Jan 9 20:11:55 2011 @@ -45,12 +45,12 @@ public class HgConsumer /** * A list of known keywords from hg */ - private static final Map IDENTIFIERS = new HashMap(); + private static final Map<String, ScmFileStatus> IDENTIFIERS = new HashMap<String, ScmFileStatus>(); /** * A list of known message prefixes from hg */ - private static final Map MESSAGES = new HashMap(); + private static final Map<String, String> MESSAGES = new HashMap<String, String>(); /** * Number of lines to keep from Std.Err @@ -62,7 +62,7 @@ public class HgConsumer /** * A list of the MAX_STDERR_SIZE last errors or warnings. */ - private final List stderr = new ArrayList(); + private final List<String> stderr = new ArrayList<String>(); static { @@ -139,19 +139,19 @@ public class HgConsumer */ public String getStdErr() { - String str = ""; - for ( Iterator it = stderr.iterator(); it.hasNext(); ) + StringBuilder str = new StringBuilder(); + for ( Iterator<String> it = stderr.iterator(); it.hasNext(); ) { - str += it.next(); + str.append( it.next() ); } - return str; + return str.toString(); } private static String processInputForKnownIdentifiers( String line ) { - for ( Iterator it = IDENTIFIERS.keySet().iterator(); it.hasNext(); ) + for ( Iterator<String> it = IDENTIFIERS.keySet().iterator(); it.hasNext(); ) { - String id = (String) it.next(); + String id = it.next(); if ( line.startsWith( id ) ) { return id; @@ -162,9 +162,9 @@ public class HgConsumer private boolean processInputForKnownMessages( String line ) { - for ( Iterator it = MESSAGES.keySet().iterator(); it.hasNext(); ) + for ( Iterator<String> it = MESSAGES.keySet().iterator(); it.hasNext(); ) { - String prefix = (String) it.next(); + String prefix = it.next(); if ( line.startsWith( prefix ) ) { stderr.add( line ); //Add line Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgChangeSet.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgChangeSet.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgChangeSet.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgChangeSet.java Sun Jan 9 20:11:55 2011 @@ -31,6 +31,7 @@ public class HgChangeSet extends ChangeSet { + private static final long serialVersionUID = -4556377494055110302L; private String branch; public HgChangeSet() Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java Sun Jan 9 20:11:55 2011 @@ -34,7 +34,7 @@ import java.util.List; public class HgOutgoingConsumer extends HgConsumer { - private List changes = new ArrayList(); + private List<HgChangeSet> changes = new ArrayList<HgChangeSet>(); private static final String BRANCH = "branch"; @@ -55,7 +55,7 @@ public class HgOutgoingConsumer } - public List getChanges() + public List<HgChangeSet> getChanges() { return changes; } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java Sun Jan 9 20:11:55 2011 @@ -82,7 +82,7 @@ public class HgRepoUtils HgUtils.execute( WORKING_DIR, init_cmd ); // Create and add files to repository - List files = new ArrayList(); + List<File> files = new ArrayList<File>(); for ( int i = 0; i < filesInTestBranch.length; i++ ) { File file = new File( WORKING_DIR.getAbsolutePath(), filesInTestBranch[i] ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java Sun Jan 9 20:11:55 2011 @@ -46,9 +46,9 @@ public class HgBlameCommandTckTest protected void verifyResult( BlameScmResult result ) { - List lines = result.getLines(); + List<BlameLine> lines = result.getLines(); assertEquals( "Expected 1 line in blame", 1, lines.size() ); - BlameLine line = (BlameLine) lines.get( 0 ); + BlameLine line = lines.get( 0 ); assertEquals( "0", line.getRevision() ); } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java?rev=1057017&r1=1057016&r2=1057017&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java Sun Jan 9 20:11:55 2011 @@ -19,6 +19,7 @@ package org.apache.maven.scm.provider.hg * under the License. */ +import org.apache.maven.scm.ChangeFile; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTestCase; @@ -109,9 +110,9 @@ public class HgDiffCommandTckTest // assertResultIsSuccess(result); - List changedFiles = result.getChangedFiles(); + List<ScmFile> changedFiles = result.getChangedFiles(); - Map differences = result.getDifferences(); + Map<String, CharSequence> differences = result.getDifferences(); // assertEquals("Expected 3 files in the changed files list " // + changedFiles, 3, changedFiles.size()); @@ -123,7 +124,7 @@ public class HgDiffCommandTckTest // Assert the files in the changed files list // ---------------------------------------------------------------------- - Iterator files = new TreeSet( changedFiles ).iterator(); + Iterator<ScmFile> files = new TreeSet<ScmFile>( changedFiles ).iterator(); // Check Foo.java ScmFile file = (ScmFile) files.next();