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/13 23:52:39 UTC
svn commit: r1058775 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn:
maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/
maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/comma...
Author: olamy
Date: Thu Jan 13 22:52:38 2011
New Revision: 1058775
URL: http://svn.apache.org/viewvc?rev=1058775&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in svn provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/IllegalOutputException.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java Thu Jan 13 22:52:38 2011
@@ -66,7 +66,7 @@ public abstract class AbstractSvnScmProv
private static class ScmUrlParserResult
{
- private List messages = new ArrayList();
+ private List<String> messages = new ArrayList<String>();
private ScmProviderRepository repository;
}
@@ -129,9 +129,9 @@ public abstract class AbstractSvnScmProv
throws ScmException;
/** {@inheritDoc} */
- public List validateScmUrl( String scmSpecificUrl, char delimiter )
+ public List<String> validateScmUrl( String scmSpecificUrl, char delimiter )
{
- List messages = new ArrayList();
+ List<String> messages = new ArrayList<String>();
try
{
makeProviderScmRepository( scmSpecificUrl, delimiter );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java Thu Jan 13 22:52:38 2011
@@ -36,18 +36,21 @@ import java.util.List;
public class SvnChangeSet
extends ChangeSet
{
+
+ private static final long serialVersionUID = -4454710577968060741L;
+
public SvnChangeSet()
{
super();
}
public SvnChangeSet( String strDate, String userDatePattern, String comment, String author,
- List/*<ChangeFile>*/files )
+ List<ChangeFile> files )
{
super( strDate, userDatePattern, comment, author, files );
}
- public SvnChangeSet( Date date, String comment, String author, List/*<ChangeFile>*/ files )
+ public SvnChangeSet( Date date, String comment, String author, List<ChangeFile> files )
{
super( date, comment, author, files );
}
@@ -68,9 +71,9 @@ public class SvnChangeSet
if ( getFiles() != null )
{
- for ( Iterator i = getFiles().iterator(); i.hasNext(); )
+ for ( Iterator<ChangeFile> i = getFiles().iterator(); i.hasNext(); )
{
- ChangeFile file = (ChangeFile) i.next();
+ ChangeFile file = i.next();
if ( currentFile.endsWith( StringUtils.replace( file.getName(), "\\", "/" ) ) )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java Thu Jan 13 22:52:38 2011
@@ -63,12 +63,12 @@ public class SvnConfigFileReader
public String getProperty( String group, String propertyName )
{
- List lines = getConfLines();
+ List<String> lines = getConfLines();
boolean inGroup = false;
- for ( Iterator i = lines.iterator(); i.hasNext(); )
+ for ( Iterator<String> i = lines.iterator(); i.hasNext(); )
{
- String line = ( (String) i.next() ).trim();
+ String line = i.next().trim();
if ( !inGroup )
{
@@ -114,9 +114,9 @@ public class SvnConfigFileReader
*
* @return the list of all lines
*/
- private List getConfLines()
+ private List<String> getConfLines()
{
- List lines = new ArrayList();
+ List<String> lines = new ArrayList<String>();
BufferedReader reader = null;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java Thu Jan 13 22:52:38 2011
@@ -31,30 +31,32 @@ import java.util.List;
public class SvnInfoScmResult
extends ScmResult
{
- private List infoItems;
+
+ private static final long serialVersionUID = 955993340040530451L;
+ private List<SvnInfoItem> infoItems;
public SvnInfoScmResult( String commandLine, String providerMessage, String commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
- infoItems = new ArrayList( 0 );
+ infoItems = new ArrayList<SvnInfoItem>( 0 );
}
- public SvnInfoScmResult( String commandLine, List files )
+ public SvnInfoScmResult( String commandLine, List<SvnInfoItem> files )
{
super( commandLine, null, null, true );
this.infoItems = files;
}
- public SvnInfoScmResult( List files, ScmResult result )
+ public SvnInfoScmResult( List<SvnInfoItem> files, ScmResult result )
{
super( result );
this.infoItems = files;
}
- public List getInfoItems()
+ public List<SvnInfoItem> getInfoItems()
{
return infoItems;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateScmResult.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateScmResult.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateScmResult.java Thu Jan 13 22:52:38 2011
@@ -19,10 +19,11 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
-import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -31,7 +32,10 @@ import java.util.List;
public class SvnUpdateScmResult
extends UpdateScmResultWithRevision
{
- public SvnUpdateScmResult( String commandLine, List updatedFiles, int revision )
+
+ private static final long serialVersionUID = -3233977852698721693L;
+
+ public SvnUpdateScmResult( String commandLine, List<ScmFile> updatedFiles, int revision )
{
super( commandLine, updatedFiles, String.valueOf( revision ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java Thu Jan 13 22:52:38 2011
@@ -218,6 +218,7 @@ public class SvnScmProviderRepositoryTes
testUrl( scmUrl, expectedUrl, expectedUser, null, expectedHost );
}
+ @SuppressWarnings( "unused" )
private void testUrl( String scmUrl, String expectedUrl, String expectedUser, String expectedPassword,
String expectedHost, int expectedPort )
throws Exception
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/IllegalOutputException.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/IllegalOutputException.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/IllegalOutputException.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/IllegalOutputException.java Thu Jan 13 22:52:38 2011
@@ -24,6 +24,7 @@ package org.apache.maven.scm.provider.sv
* Thrown when the output of an svn log command isn't recognized.
* @since 1.3
*/
+@SuppressWarnings( "serial" )
public class IllegalOutputException
extends RuntimeException
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java Thu Jan 13 22:52:38 2011
@@ -109,7 +109,7 @@ public class SvnInfoCommand
cl.createArg().setValue( revision );
}
- Iterator it = fileSet.getFileList().iterator();
+ Iterator<File> it = fileSet.getFileList().iterator();
while ( it.hasNext() )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java Thu Jan 13 22:52:38 2011
@@ -32,7 +32,7 @@ import java.util.List;
public class SvnInfoConsumer
implements StreamConsumer
{
- private List infoItems = new ArrayList();
+ private List<SvnInfoItem> infoItems = new ArrayList<SvnInfoItem>();
private SvnInfoItem currentItem = new SvnInfoItem();
@@ -105,7 +105,7 @@ public class SvnInfoConsumer
}
}
- public List getInfoItems()
+ public List<SvnInfoItem> getInfoItems()
{
return infoItems;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java Thu Jan 13 22:52:38 2011
@@ -47,9 +47,9 @@ public abstract class SvnBlameCommandTck
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( "trygvis", line.getAuthor() );
assertEquals( "7", line.getRevision() );
}