Author: olamy Date: Sun Jan 9 20:13:07 2011 New Revision: 1057019 URL: http://svn.apache.org/viewvc?rev=1057019&view=rev Log: [SCM-591] Move to Java 1.5 : fix some generics warning in perforce provider
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceHaveConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumerTest.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java Sun Jan 9 20:13:07 2011 @@ -20,8 +20,14 @@ package org.apache.maven.scm.provider.pe */ +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.InetAddress; +import java.net.UnknownHostException; + import org.apache.maven.scm.CommandParameters; -import org.apache.maven.scm.NoSuchCommandScmException; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.command.add.AddScmResult; @@ -60,13 +66,6 @@ import org.apache.maven.scm.repository.S import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.Commandline; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.InetAddress; -import java.net.UnknownHostException; - /** * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl </a> * @author mperham @@ -509,6 +508,7 @@ public class PerforceScmProvider command.setExecutable( "p4" ); Process proc = command.execute(); BufferedReader br = new BufferedReader( new InputStreamReader( proc.getInputStream() ) ); + @SuppressWarnings( "unused" ) String line; while ( ( line = br.readLine() ) != null ) { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java Sun Jan 9 20:13:07 2011 @@ -66,7 +66,7 @@ public class PerforceInfoCommand { private static PerforceInfoCommand singleton = null; - private Map entries = null; + private Map<String,String> entries = null; public static PerforceInfoCommand getInfo( ScmLogger logger, PerforceScmProviderRepository repo ) { @@ -126,7 +126,7 @@ public class PerforceInfoCommand Process proc = command.execute(); BufferedReader br = new BufferedReader( new InputStreamReader( proc.getInputStream() ) ); String line; - entries = new HashMap(); + entries = new HashMap<String,String>(); while ( ( line = br.readLine() ) != null ) { int idx = line.indexOf( ':' ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java Sun Jan 9 20:13:07 2011 @@ -30,7 +30,7 @@ import java.util.Map; */ public class PerforceVerbMapper { - private static final Map VERB = new HashMap(); + private static final Map<String,ScmFileStatus> VERB = new HashMap<String,ScmFileStatus>(); static { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java Sun Jan 9 20:13:07 2011 @@ -40,9 +40,9 @@ public class PerforceFilelogConsumer private RE lineRegexp; - private Map dates = new HashMap(); + private Map<String, Date> dates = new HashMap<String,Date>(); - private Map authors = new HashMap(); + private Map<String,String> authors = new HashMap<String,String>(); public PerforceFilelogConsumer( ScmLogger logger ) { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java Sun Jan 9 20:13:07 2011 @@ -45,7 +45,7 @@ public class PerforceChangeLogConsumer */ private static final String PERFORCE_TIMESTAMP_PATTERN = "yyyy/MM/dd HH:mm:ss"; - private List entries = new ArrayList(); + private List<ChangeSet> entries = new ArrayList<ChangeSet>(); /** * State machine constant: expecting revision and/or file information @@ -136,14 +136,14 @@ public class PerforceChangeLogConsumer // // ---------------------------------------------------------------------- - public List getModifications() throws ScmException + public List<ChangeSet> getModifications() throws ScmException { // Here there are one entry for each couple (changelist,file). We merge // entries to have only one entry per changelist // Date > ChangeSet - Map groupedEntries = new LinkedHashMap(); + Map<Date,ChangeSet> groupedEntries = new LinkedHashMap<Date,ChangeSet>(); for ( int i = 0; i < entries.size(); i++ ) { ChangeSet cs = (ChangeSet) entries.get( i ); @@ -162,7 +162,7 @@ public class PerforceChangeLogConsumer } } - ArrayList result = new ArrayList(); + List<ChangeSet> result = new ArrayList<ChangeSet>(); result.addAll( groupedEntries.values() ); return result; Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java Sun Jan 9 20:13:07 2011 @@ -19,8 +19,8 @@ package org.apache.maven.scm.provider.pe * under the License. */ +import java.io.ByteArrayInputStream; import java.io.File; -import java.io.StringBufferInputStream; import org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmException; @@ -66,7 +66,7 @@ public class PerforceLoginCommand else { CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer(); - int exitCode = CommandLineUtils.executeCommandLine( cl, new StringBufferInputStream( password ), + int exitCode = CommandLineUtils.executeCommandLine( cl, new ByteArrayInputStream( password.getBytes() ), consumer, err ); isSuccess = consumer.isSuccess(); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceHaveConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceHaveConsumer.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceHaveConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceHaveConsumer.java Sun Jan 9 20:13:07 2011 @@ -19,19 +19,12 @@ package org.apache.maven.scm.provider.pe * under the License. */ -import org.apache.maven.scm.ChangeFile; -import org.apache.maven.scm.ChangeSet; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.log.ScmLogger; import org.apache.maven.scm.util.AbstractConsumer; import org.apache.regexp.RE; import org.apache.regexp.RESyntaxException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse</a> * @version $Id$ Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java Sun Jan 9 20:13:07 2011 @@ -19,16 +19,15 @@ package org.apache.maven.scm.provider.pe * under the License. */ -import org.apache.maven.scm.ChangeFile; -import org.apache.maven.scm.ChangeSet; -import org.apache.maven.scm.ScmTestCase; -import org.apache.maven.scm.log.DefaultLog; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.util.ArrayList; +import java.util.List; + +import org.apache.maven.scm.ScmTestCase; +import org.apache.maven.scm.log.DefaultLog; /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse</a> @@ -54,7 +53,7 @@ public class PerforceChangeLogConsumerTe s = in.readLine(); } - ArrayList entries = new ArrayList( consumer.getChanges() ); + List<String> entries = new ArrayList<String>( consumer.getChanges() ); assertEquals( "Wrong number of entries returned", 7, entries.size() ); String changelist = (String) entries.get(2); assertEquals( "9", changelist ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumerTest.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumerTest.java Sun Jan 9 20:13:07 2011 @@ -19,16 +19,17 @@ package org.apache.maven.scm.provider.pe * under the License. */ -import org.apache.maven.scm.ChangeFile; -import org.apache.maven.scm.ChangeSet; -import org.apache.maven.scm.ScmTestCase; -import org.apache.maven.scm.log.DefaultLog; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.util.ArrayList; +import java.util.List; + +import org.apache.maven.scm.ChangeFile; +import org.apache.maven.scm.ChangeSet; +import org.apache.maven.scm.ScmTestCase; +import org.apache.maven.scm.log.DefaultLog; /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse</a> @@ -54,15 +55,15 @@ public class PerforceDescribeConsumerTes s = in.readLine(); } - ArrayList entries = new ArrayList( consumer.getModifications() ); + List<ChangeSet> entries = new ArrayList<ChangeSet>( consumer.getModifications() ); assertEquals( "Wrong number of entries returned", 7, entries.size() ); - ChangeSet entry = (ChangeSet) entries.get(0); + ChangeSet entry = entries.get(0); assertEquals( "mcronin", entry.getAuthor() ); assertEquals( "Wrong number of files returned", 3, entry.getFiles().size() ); assertEquals( "demo/demo.c", ( (ChangeFile) entry.getFiles().get( 0 ) ).getName() ); assertEquals( "2003-08-07", entry.getDateFormatted() ); assertEquals( "17:21:57", entry.getTimeFormatted() ); - entry = (ChangeSet) entries.get(6); + entry = entries.get(6); assertEquals( "jim", entry.getAuthor() ); assertEquals( "Wrong number of files returned", 1, entry.getFiles().size() ); assertEquals( "junk/linefeed.txt", ( (ChangeFile) entry.getFiles().get( 0 ) ).getName() ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java Sun Jan 9 20:13:07 2011 @@ -19,14 +19,15 @@ package org.apache.maven.scm.provider.pe * under the License. */ -import org.apache.maven.scm.ScmTestCase; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.ScmTestCase; + /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse</a> * @version $Id$ @@ -50,9 +51,9 @@ public class PerforceRemoveConsumerTest s = in.readLine(); } - List removes = consumer.getRemovals(); + List<ScmFile> removes = consumer.getRemovals(); assertEquals( "Wrong number of entries returned", 2, removes.size() ); - String entry = (String) removes.get( 0 ); + String entry = removes.get( 0 ).getPath(); assertTrue( entry.startsWith( "//" ) ); assertTrue( entry.endsWith( "foo.xml" ) ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java Sun Jan 9 20:13:07 2011 @@ -55,15 +55,14 @@ public class PerforceStatusConsumerTest assertEquals( "", consumer.getOutput() ); assertTrue( consumer.isSuccess() ); - List results = consumer.getDepotfiles(); + List<String> results = consumer.getDepotfiles(); assertEquals( "Wrong number of entries returned", 4, results.size() ); String entry = (String) results.get( 0 ); assertEquals( 33, entry.indexOf( "Foo.java" ) ); - results = PerforceStatusCommand.createResults( "//depot/sandbox/mperham/scm-test", consumer ); + List<ScmFile> scmFiles = PerforceStatusCommand.createResults( "//depot/sandbox/mperham/scm-test", consumer ); assertEquals( 4, results.size() ); - assertTrue( results.get( 0 ) instanceof ScmFile ); - ScmFile file = (ScmFile) results.get( 0 ); + ScmFile file = scmFiles.get( 0 ); assertEquals( "Foo.java", file.getPath() ); assertEquals( ScmFileStatus.ADDED, file.getStatus() ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java Sun Jan 9 20:13:07 2011 @@ -19,14 +19,15 @@ package org.apache.maven.scm.provider.pe * under the License. */ -import org.apache.maven.scm.ScmTestCase; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.ScmTestCase; + /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse </a> * @version $Id: PerforceChangeLogConsumerTest.java 331276 2005-11-07 15:04:54Z @@ -53,9 +54,9 @@ public class PerforceTagConsumerTest assertEquals( "", consumer.getOutput() ); assertTrue( consumer.isSuccess() ); - List results = consumer.getTagged(); + List<ScmFile> results = consumer.getTagged(); assertEquals( "Wrong number of entries returned", 2, results.size() ); - String entry = (String) results.get( 0 ); + String entry = results.get( 0 ).getPath(); assertTrue( entry.endsWith( "pom.xml" ) ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java?rev=1057019&r1=1057018&r2=1057019&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java Sun Jan 9 20:13:07 2011 @@ -19,14 +19,15 @@ package org.apache.maven.scm.provider.pe * under the License. */ -import org.apache.maven.scm.ScmTestCase; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.ScmTestCase; + /** * @author <a href="mailto:eveni...@apache.org">Emmanuel Venisse </a> * @version $Id: PerforceChangeLogConsumerTest.java 331276 2005-11-07 15:04:54Z @@ -52,9 +53,9 @@ public class PerforceUnEditConsumerTest } assertTrue( consumer.isSuccess() ); - List edits = consumer.getEdits(); + List<ScmFile> edits = consumer.getEdits(); assertEquals( "Wrong number of entries returned", 2, edits.size() ); - String entry = (String) edits.get( 0 ); + String entry = edits.get( 0 ).getPath(); assertTrue( entry.startsWith( "//" ) ); assertTrue( entry.endsWith( ".classpath" ) ); }