Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 27116 invoked from network); 9 Jan 2011 20:12:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Jan 2011 20:12:54 -0000 Received: (qmail 27551 invoked by uid 500); 9 Jan 2011 20:12:54 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 27522 invoked by uid 500); 9 Jan 2011 20:12:54 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-dev@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 27515 invoked by uid 99); 9 Jan 2011 20:12:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jan 2011 20:12:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jan 2011 20:12:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD1B423889DE; Sun, 9 Jan 2011 20:12:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057018 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src: main/java/org/apache/maven/scm/provider/local/command/checkout/ main/java/org/apache/maven/scm/provider/local/command/list/ main/java/org/apache/maven/scm/prov... Date: Sun, 09 Jan 2011 20:12:29 -0000 To: scm-commits@maven.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110109201229.CD1B423889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Sun Jan 9 20:12:29 2011 New Revision: 1057018 URL: http://svn.apache.org/viewvc?rev=1057018&view=rev Log: [SCM-591] Move to Java 1.5 : fix some generics warning in local provider Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java?rev=1057018&r1=1057017&r2=1057018&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java Sun Jan 9 20:12:29 2011 @@ -19,10 +19,11 @@ package org.apache.maven.scm.provider.lo * under the License. */ -import org.apache.maven.scm.command.checkout.CheckOutScmResult; - import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.command.checkout.CheckOutScmResult; + /** * @author Trygve Laugstøl * @version $Id$ @@ -30,7 +31,9 @@ import java.util.List; public class LocalCheckOutScmResult extends CheckOutScmResult { - public LocalCheckOutScmResult( String commandLine, List files ) + private static final long serialVersionUID = -2646018573623668026L; + + public LocalCheckOutScmResult( String commandLine, List files ) { super( commandLine, files ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java?rev=1057018&r1=1057017&r2=1057018&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java Sun Jan 9 20:12:29 2011 @@ -19,10 +19,11 @@ package org.apache.maven.scm.provider.lo * under the License. */ -import org.apache.maven.scm.command.list.ListScmResult; - import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.command.list.ListScmResult; + /** * @author Emmanuel Venisse * @version $Id$ @@ -30,7 +31,10 @@ import java.util.List; public class LocalListScmResult extends ListScmResult { - public LocalListScmResult( String commandLine, List files ) + + private static final long serialVersionUID = 259954569217343901L; + + public LocalListScmResult( String commandLine, List files ) { super( commandLine, files ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java?rev=1057018&r1=1057017&r2=1057018&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java Sun Jan 9 20:12:29 2011 @@ -19,10 +19,11 @@ package org.apache.maven.scm.provider.lo * under the License. */ -import org.apache.maven.scm.command.update.UpdateScmResult; - import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.command.update.UpdateScmResult; + /** * @author Trygve Laugstøl * @version $Id$ @@ -30,7 +31,9 @@ import java.util.List; public class LocalUpdateScmResult extends UpdateScmResult { - public LocalUpdateScmResult( String commandLine, List files ) + private static final long serialVersionUID = -932254303678432167L; + + public LocalUpdateScmResult( String commandLine, List files ) { super( commandLine, files ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java?rev=1057018&r1=1057017&r2=1057018&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java Sun Jan 9 20:12:29 2011 @@ -64,7 +64,8 @@ public class LocalScmMetadataUtils public LocalScmMetadata buildMetadata( File repository ) throws IOException { - List repoFilenames = FileUtils.getFileNames( repository.getAbsoluteFile(), "**", null, false ); + @SuppressWarnings( "unchecked" ) + List repoFilenames = FileUtils.getFileNames( repository.getAbsoluteFile(), "**", null, false ); LocalScmMetadata metadata = new LocalScmMetadata(); metadata.setRepositoryFileNames( repoFilenames ); return metadata; Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java?rev=1057018&r1=1057017&r2=1057018&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java Sun Jan 9 20:12:29 2011 @@ -35,7 +35,7 @@ public class LocalScmProviderRepository private String module; - private Set addedFiles = new HashSet(); + private Set addedFiles = new HashSet(); /** * @param root Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java?rev=1057018&r1=1057017&r2=1057018&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java Sun Jan 9 20:12:29 2011 @@ -19,6 +19,12 @@ package org.apache.maven.scm.provider.lo * under the License. */ +import java.io.File; +import java.io.FileReader; +import java.io.Reader; +import java.util.List; + +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.provider.local.metadata.LocalScmMetadata; import org.apache.maven.scm.provider.local.metadata.io.xpp3.LocalScmMetadataXpp3Reader; @@ -26,11 +32,6 @@ import org.apache.maven.scm.tck.command. import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; -import java.io.File; -import java.io.FileReader; -import java.io.Reader; -import java.util.List; - /** * @author Emmanuel Venisse * @version $Id$ @@ -74,7 +75,7 @@ public class LocalCheckOutCommandTckTest assertResultIsSuccess( result ); - List checkedOutFiles = result.getCheckedOutFiles(); + List checkedOutFiles = result.getCheckedOutFiles(); assertEquals( 4, checkedOutFiles.size() ); @@ -94,7 +95,8 @@ public class LocalCheckOutCommandTckTest IOUtil.close( reader ); } File root = new File( getRepositoryRoot() + "/" + module ); - List fileNames = FileUtils.getFileNames( root, "**", null, false ); + @SuppressWarnings( "unchecked" ) + List fileNames = FileUtils.getFileNames( root, "**", null, false ); assertEquals( fileNames, metadata.getRepositoryFileNames() ); } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java?rev=1057018&r1=1057017&r2=1057018&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java Sun Jan 9 20:12:29 2011 @@ -19,10 +19,17 @@ package org.apache.maven.scm.provider.lo * under the License. */ +import java.io.File; +import java.io.FileReader; +import java.io.Reader; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; + import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTestCase; -import org.apache.maven.scm.ScmVersion; import org.apache.maven.scm.command.update.UpdateScmResult; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.provider.local.metadata.LocalScmMetadata; @@ -32,14 +39,6 @@ import org.apache.maven.scm.tck.command. import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; -import java.io.File; -import java.io.FileReader; -import java.io.Reader; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.TreeSet; - /** * @author Trygve Laugstøl * @version $Id$ @@ -104,7 +103,7 @@ public class LocalUpdateCommandTckTest assertResultIsSuccess( result ); - List updatedFiles = result.getUpdatedFiles(); + List updatedFiles = result.getUpdatedFiles(); assertEquals( "Expected 1 files in the updated files list " + updatedFiles, 1, updatedFiles.size() ); @@ -112,7 +111,7 @@ public class LocalUpdateCommandTckTest // Assert the files in the updated files list // ---------------------------------------------------------------------- - Iterator files = new TreeSet( updatedFiles ).iterator(); + Iterator files = new TreeSet( updatedFiles ).iterator(); // readme.txt ScmFile file = (ScmFile) files.next(); @@ -145,7 +144,8 @@ public class LocalUpdateCommandTckTest IOUtil.close( reader ); } File root = new File( getRepositoryRoot() + "/" + moduleName ); - List fileNames = FileUtils.getFileNames( root, "**", null, false ); + @SuppressWarnings( "unchecked" ) + List fileNames = FileUtils.getFileNames( root, "**", null, false ); assertEquals( fileNames, metadata.getRepositoryFileNames() ); }