Author: olamy Date: Fri Dec 31 16:01:45 2010 New Revision: 1054130 URL: http://svn.apache.org/viewvc?rev=1054130&view=rev Log: [SCM-591] move to Java 1.5
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java?rev=1054130&r1=1054129&r2=1054130&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java Fri Dec 31 16:01:45 2010 @@ -20,7 +20,6 @@ package org.apache.maven.scm.log; */ import java.util.ArrayList; -import java.util.Iterator; import java.util.List; /** @@ -30,7 +29,7 @@ import java.util.List; public class ScmLogDispatcher implements ScmLogger { - private List listeners = new ArrayList(); + private List<ScmLogger> listeners = new ArrayList<ScmLogger>(); public void addListener( ScmLogger logger ) { @@ -40,10 +39,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void debug( String content, Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.debug( content, error ); } } @@ -51,10 +48,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void debug( String content ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.debug( content ); } } @@ -62,10 +57,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void debug( Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.debug( error ); } } @@ -73,10 +66,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void error( String content, Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.error( content, error ); } } @@ -84,10 +75,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void error( String content ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.error( content ); } } @@ -95,10 +84,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void error( Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.error( error ); } } @@ -106,10 +93,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void info( String content, Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - if ( logger.isInfoEnabled() ) { logger.info( content, error ); @@ -120,10 +105,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void info( String content ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - if ( logger.isInfoEnabled() ) { logger.info( content ); @@ -134,10 +117,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void info( Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - if ( logger.isInfoEnabled() ) { logger.info( error ); @@ -148,10 +129,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public boolean isDebugEnabled() { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - if ( logger.isDebugEnabled() ) { return true; @@ -164,10 +143,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public boolean isErrorEnabled() { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - if ( logger.isErrorEnabled() ) { return true; @@ -180,10 +157,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public boolean isInfoEnabled() { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - if ( logger.isInfoEnabled() ) { return true; @@ -196,10 +171,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public boolean isWarnEnabled() { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - if ( logger.isWarnEnabled() ) { return true; @@ -212,10 +185,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void warn( String content, Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.warn( content, error ); } } @@ -223,10 +194,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void warn( String content ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.warn( content ); } } @@ -234,10 +203,8 @@ public class ScmLogDispatcher /** {...@inheritdoc} */ public void warn( Throwable error ) { - for ( Iterator i = listeners.iterator(); i.hasNext(); ) + for ( ScmLogger logger : listeners ) { - ScmLogger logger = (ScmLogger) i.next(); - logger.warn( error ); } } Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java?rev=1054130&r1=1054129&r2=1054130&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java Fri Dec 31 16:01:45 2010 @@ -19,9 +19,19 @@ package org.apache.maven.scm.manager; * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import org.apache.maven.scm.ScmBranch; +import org.apache.maven.scm.ScmBranchParameters; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; +import org.apache.maven.scm.ScmTagParameters; import org.apache.maven.scm.ScmVersion; import org.apache.maven.scm.command.add.AddScmResult; import org.apache.maven.scm.command.blame.BlameScmResult; @@ -47,14 +57,6 @@ import org.apache.maven.scm.repository.S import org.apache.maven.scm.repository.ScmRepositoryException; import org.apache.maven.scm.repository.UnknownRepositoryStructure; -import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * @author <a href="mailto:tryg...@inamo.no">Trygve Laugstøl</a> * @author <a href="mailto:br...@apache.org">Brett Porter</a> @@ -64,13 +66,13 @@ import java.util.Map; public abstract class AbstractScmManager implements ScmManager { - private Map scmProviders = new HashMap(); + private Map<String,ScmProvider> scmProviders = new HashMap<String,ScmProvider>(); private ScmLogger logger; - private Map userProviderTypes = new HashMap(); + private Map<String,String> userProviderTypes = new HashMap<String,String>(); - protected void setScmProviders( Map/*<String,ScmProvider>*/ providers ) + protected void setScmProviders( Map<String,ScmProvider> providers ) { this.scmProviders = providers; } @@ -129,11 +131,9 @@ public abstract class AbstractScmManager { logger = getScmLogger(); - for ( Iterator i = scmProviders.keySet().iterator(); i.hasNext(); ) + for ( Entry<String,ScmProvider> entry : scmProviders.entrySet() ) { - String key = (String) i.next(); - - ScmProvider p = (ScmProvider) scmProviders.get( key ); + ScmProvider p = scmProviders.get( entry.getKey() ); p.addListener( logger ); } @@ -270,9 +270,9 @@ public abstract class AbstractScmManager } /** {...@inheritdoc} */ - public List validateScmRepository( String scmUrl ) + public List<String> validateScmRepository( String scmUrl ) { - List messages = new ArrayList(); + List<String> messages = new ArrayList<String>(); messages.addAll( ScmUrlUtils.validate( scmUrl ) ); @@ -293,7 +293,7 @@ public abstract class AbstractScmManager String scmSpecificUrl = cleanScmUrl( scmUrl.substring( providerType.length() + 5 ) ); - List providerMessages = + List<String> providerMessages = provider.validateScmUrl( scmSpecificUrl, ScmUrlUtils.getDelimiter( scmUrl ).charAt( 0 ) ); if ( providerMessages == null ) @@ -324,14 +324,16 @@ public abstract class AbstractScmManager public BranchScmResult branch( ScmRepository repository, ScmFileSet fileSet, String branchName ) throws ScmException { - return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName ); + ScmBranchParameters scmBranchParameters = new ScmBranchParameters( "" ); + return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName, scmBranchParameters ); } /** {...@inheritdoc} */ public BranchScmResult branch( ScmRepository repository, ScmFileSet fileSet, String branchName, String message ) throws ScmException { - return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName, message ); + ScmBranchParameters scmBranchParameters = new ScmBranchParameters( message ); + return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName, scmBranchParameters ); } /** {...@inheritdoc} */ @@ -489,14 +491,15 @@ public abstract class AbstractScmManager public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tagName ) throws ScmException { - return this.getProviderByRepository( repository ).tag( repository, fileSet, tagName ); + return this.tag( repository, fileSet, tagName, "" ); } /** {...@inheritdoc} */ public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tagName, String message ) throws ScmException { - return this.getProviderByRepository( repository ).tag( repository, fileSet, tagName, message ); + ScmTagParameters scmTagParameters = new ScmTagParameters( message ); + return this.getProviderByRepository( repository ).tag( repository, fileSet, tagName, scmTagParameters ); } /** {...@inheritdoc} */ Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java?rev=1054130&r1=1054129&r2=1054130&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java Fri Dec 31 16:01:45 2010 @@ -82,7 +82,7 @@ public interface ScmProvider * @param delimiter The delimiter used in the SCM url * @return Returns a list of messages if the validation failed */ - List validateScmUrl( String scmSpecificUrl, char delimiter ); + List<String> validateScmUrl( String scmSpecificUrl, char delimiter ); /** * Returns the scm reserved file name where the SCM stores information like 'CVS', '.svn'. Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java?rev=1054130&r1=1054129&r2=1054130&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java Fri Dec 31 16:01:45 2010 @@ -111,7 +111,7 @@ public abstract class ScmUrlUtils */ public static boolean isValid( String scmUrl ) { - List messages = validate( scmUrl ); + List<String> messages = validate( scmUrl ); return messages.isEmpty(); } @@ -125,9 +125,9 @@ public abstract class ScmUrlUtils * @param scmUrl The scm url to validate * @return A <code>List</code> that contains the errors that occured */ - public static List validate( String scmUrl ) + public static List<String> validate( String scmUrl ) { - List messages = new ArrayList(); + List<String> messages = new ArrayList<String>(); if ( scmUrl == null ) { @@ -152,7 +152,7 @@ public abstract class ScmUrlUtils try { - String delimiter = getDelimiter( scmUrl ); + getDelimiter( scmUrl ); } catch ( IllegalArgumentException e ) { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.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/add/PerforceAddConsumerTest.java?rev=1054130&r1=1054129&r2=1054130&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java Fri Dec 31 16:01:45 2010 @@ -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 PerforceAddConsumerTest s = in.readLine(); } - List adds = consumer.getAdditions(); + List<ScmFile> adds = consumer.getAdditions(); assertEquals( "Wrong number of entries returned", 3, adds.size() ); - String entry = (String) adds.get( 0 ); + String entry = adds.get( 0 ).getPath(); assertTrue( entry.startsWith( "//" ) ); assertTrue( entry.endsWith( "foo.xml" ) ); } 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/AbstractCvsScmProvider.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/AbstractCvsScmProvider.java?rev=1054130&r1=1054129&r2=1054130&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/AbstractCvsScmProvider.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/AbstractCvsScmProvider.java Fri Dec 31 16:01:45 2010 @@ -22,7 +22,6 @@ package org.apache.maven.scm.provider.cv import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.apache.maven.scm.CommandParameters; @@ -88,19 +87,19 @@ public abstract class AbstractCvsScmProv */ public static class ScmUrlParserResult { - private List messages; + private List<String> messages; private ScmProviderRepository repository; public ScmUrlParserResult() { - messages = new ArrayList(); + messages = new ArrayList<String>(); } /** * @return the messages */ - public List getMessages() + public List<String> getMessages() { return messages; } @@ -108,7 +107,7 @@ public abstract class AbstractCvsScmProv /** * @param messages the messages to set */ - public void setMessages( List messages ) + public void setMessages( List<String> messages ) { this.messages = messages; } @@ -134,7 +133,7 @@ public abstract class AbstractCvsScmProv */ public void resetMessages() { - this.messages = new ArrayList(); + this.messages = new ArrayList<String>(); } } @@ -241,7 +240,7 @@ public abstract class AbstractCvsScmProv } /** {...@inheritdoc} */ - public List validateScmUrl( String scmSpecificUrl, char delimiter ) + public List<String> validateScmUrl( String scmSpecificUrl, char delimiter ) { ScmUrlParserResult result = parseScmUrl( scmSpecificUrl, delimiter ); @@ -787,18 +786,18 @@ public abstract class AbstractCvsScmProv try { File basedir = getAbsoluteFilePath( currentFileSet.getBasedir() ); - - File[] files = currentFileSet.getFiles(); - - for ( int i = 0; i < files.length; ++i ) + List<File> fixedFiles = new ArrayList<File>(currentFileSet.getFileList().size()); + for ( File file : currentFileSet.getFileList() ) { - if ( files[i].isAbsolute() ) + if ( file.isAbsolute() ) { - files[i] = new File( getRelativePath( basedir, files[i] ) ); + fixedFiles.add( new File( getRelativePath( basedir, file ) ) ); + } else { + fixedFiles.add( file ); } } - newFileSet = new ScmFileSet( basedir, Arrays.asList( files ) ); + newFileSet = new ScmFileSet( basedir, fixedFiles ); } catch ( IOException e ) {