maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1054126 - in /maven/scm/trunk: ./ maven-scm-api/src/main/java/org/apache/maven/scm/ maven-scm-api/src/main/java/org/apache/maven/scm/command/add/ maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ maven-scm-api/src/main/ja...
Date Fri, 31 Dec 2010 15:18:14 GMT
Author: olamy
Date: Fri Dec 31 15:18:11 2010
New Revision: 1054126

URL: http://svn.apache.org/viewvc?rev=1054126&view=rev
Log:
[SCM-591] move to Java 1.5
starting with add command.

Modified:
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddConsumer.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/command/add/AbstractCvsAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/add/CvsExeAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/add/CvsJavaAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.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/AbstractFileCheckingConsumer.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/add/SvnAddCommand.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/add/SvnAddConsumer.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/update/SvnUpdateCommand.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/update/SvnUpdateConsumer.java
    maven/scm/trunk/pom.xml

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java Fri Dec 31 15:18:11 2010
@@ -114,7 +114,7 @@ public class ChangeFile
      */
     public String toString()
     {
-        StringBuffer buffer = new StringBuffer( getName() );
+        StringBuilder buffer = new StringBuilder( getName() );
 
         if ( getRevision() != null )
         {

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java Fri Dec 31 15:18:11 2010
@@ -24,7 +24,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.scm.provider.ScmProviderRepository;
@@ -112,7 +111,7 @@ public class ChangeSet
     /**
      * List of ChangeFile
      */
-    private List/*<ChangeFile>*/ files;
+    private List<ChangeFile> files;
     
     /**
      * The SCM revision id for this changeset.
@@ -128,7 +127,7 @@ public class ChangeSet
      * @param files           The ChangeFile list
      */
     public ChangeSet( String strDate, String userDatePattern, String comment, String author,
-                      List/*<ChangeFile>*/ files )
+                      List<ChangeFile> files )
     {
         this( null, comment, author, files );
 
@@ -141,7 +140,7 @@ public class ChangeSet
      * @param author  User who made changes
      * @param files   The ChangeFile list
      */
-    public ChangeSet( Date date, String comment, String author, List/*<ChangeFile>*/ files )
+    public ChangeSet( Date date, String comment, String author, List<ChangeFile> files )
     {
         setDate( date );
 
@@ -157,6 +156,7 @@ public class ChangeSet
      */
     public ChangeSet()
     {
+        // no op
     }
 
     /**
@@ -164,11 +164,11 @@ public class ChangeSet
      *
      * @return List of ChangeFile.
      */
-    public List/*<ChangeFile>*/ getFiles()
+    public List<ChangeFile> getFiles()
     {
         if ( files == null )
         {
-            return new ArrayList();
+            return new ArrayList<ChangeFile>();
         }
         return files;
     }
@@ -178,7 +178,7 @@ public class ChangeSet
      *
      * @param files List of ChangeFiles.
      */
-    public void setFiles( List/*<ChangeFile>*/ files )
+    public void setFiles( List<ChangeFile> files )
     {
         this.files = files;
     }
@@ -187,7 +187,7 @@ public class ChangeSet
     {
         if ( files == null )
         {
-            files = new ArrayList();
+            files = new ArrayList<ChangeFile>();
         }
 
         files.add( file );
@@ -208,9 +208,8 @@ public class ChangeSet
     {
         if ( files != null )
         {
-            for ( Iterator i = files.iterator(); i.hasNext(); )
+            for ( ChangeFile file : files )
             {
-                ChangeFile file = (ChangeFile) i.next();
                 String f1 = FilenameUtils.normalizeFilename( file.getName() );
                 String f2 = FilenameUtils.normalizeFilename( filename );
                 if ( f1.indexOf( f2 ) >= 0 )
@@ -422,14 +421,12 @@ public class ChangeSet
     /** {@inheritDoc} */
     public String toString()
     {
-        StringBuffer result = new StringBuffer( author == null ? " null " : author );
+        StringBuilder result = new StringBuilder( author == null ? " null " : author );
         result.append( "\n" ).append( date == null ? "null " : date.toString() ).append( "\n" );
         if ( files != null )
         {
-            for ( Iterator i = files.iterator(); i.hasNext(); )
+            for ( ChangeFile file : files )
             {
-                ChangeFile file = (ChangeFile) i.next();
-
                 result.append( file == null ? " null " : file.toString() ).append( "\n" );
             }
         }
@@ -447,9 +444,7 @@ public class ChangeSet
      */
     public String toXML()
     {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append( "\t<changelog-entry>\n" );
+        StringBuilder buffer = new StringBuilder("\t<changelog-entry>\n" );
 
         if ( getDate() != null )
         {
@@ -467,9 +462,8 @@ public class ChangeSet
 
         if ( files != null )
         {
-            for ( Iterator i = files.iterator(); i.hasNext(); )
+            for ( ChangeFile file : files )
             {
-                ChangeFile file = (ChangeFile) i.next();
                 buffer.append( "\t\t<file>\n" ).append( "\t\t\t<name>" ).append( escapeValue( file.getName() ) )
                     .append( "</name>\n" ).append( "\t\t\t<revision>" ).append( file.getRevision() )
                     .append( "</revision>\n" );
@@ -540,7 +534,7 @@ public class ChangeSet
      */
     public static String escapeValue( Object value )
     {
-        StringBuffer buffer = new StringBuffer( value.toString() );
+        StringBuilder buffer = new StringBuilder( value.toString() );
         for ( int i = 0, size = buffer.length(); i < size; i++ )
         {
             switch ( buffer.charAt( i ) )

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java Fri Dec 31 15:18:11 2010
@@ -1,7 +1,5 @@
 package org.apache.maven.scm;
 
-import java.io.Serializable;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,12 +19,14 @@ import java.io.Serializable;
  * under the License.
  */
 
+import java.io.Serializable;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
 public class ScmFile
-    implements Comparable, Serializable
+    implements Comparable<ScmFile>, Serializable
 {
     private static final long serialVersionUID = -9133015730693522690L;
 
@@ -66,9 +66,9 @@ public class ScmFile
     // ----------------------------------------------------------------------
 
     /** {@inheritDoc} */
-    public int compareTo( Object other )
+    public int compareTo( ScmFile other )
     {
-        return ( (ScmFile) other ).getPath().compareTo( path );
+        return other.getPath().compareTo( path );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java Fri Dec 31 15:18:11 2010
@@ -56,7 +56,7 @@ public class ScmFileSet
     /**
      * List of File objects, all relative to the basedir.
      */
-    private final List files;
+    private final List<File> files;
 
     /**
      * Create a file set with no files, only the base directory.
@@ -65,7 +65,7 @@ public class ScmFileSet
      */
     public ScmFileSet( File basedir )
     {
-        this( basedir, new ArrayList( 0 ) );
+        this( basedir, new ArrayList<File>( 0 ) );
     }
 
     /**
@@ -102,8 +102,9 @@ public class ScmFileSet
         {
             excludes = DEFAULT_EXCLUDES;
         }
-
-        this.files = FileUtils.getFiles( basedir, includes, excludes, false );
+        @SuppressWarnings( "unchecked" )
+        List<File> fileList = (List<File>) FileUtils.getFiles( basedir, includes, excludes, false ); 
+        this.files = fileList;
         this.includes = includes;
         this.excludes = excludes;
     }
@@ -140,7 +141,7 @@ public class ScmFileSet
      * @param basedir directory files are relative to
      * @param files   list of File objects, files that the set will contain, have to be relative to basedir
      */
-    public ScmFileSet( File basedir, List files )
+    public ScmFileSet( File basedir, List<File> files )
     {
         if ( basedir == null )
         {
@@ -182,7 +183,7 @@ public class ScmFileSet
      *
      * @return List of File objects
      */
-    public List getFileList()
+    public List<File> getFileList()
     {
         return this.files;
     }

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java Fri Dec 31 15:18:11 2010
@@ -1,7 +1,5 @@
 package org.apache.maven.scm;
 
-import java.io.Serializable;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +19,8 @@ import java.io.Serializable;
  * under the License.
  */
 
+import java.io.Serializable;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java Fri Dec 31 15:18:11 2010
@@ -19,11 +19,12 @@ package org.apache.maven.scm.command.add
  * under the License.
  */
 
-import org.apache.maven.scm.ScmResult;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
 /**
  * Result of adding files to the SCM
  *
@@ -33,16 +34,18 @@ import java.util.List;
 public class AddScmResult
     extends ScmResult
 {
-    private List/*<ScmFile>*/ addedFiles;
+    private static final long serialVersionUID = 1L;
+    
+    private List<ScmFile> addedFiles;
 
     public AddScmResult( String commandLine, String providerMessage, String commandOutput, boolean success )
     {
         super( commandLine, providerMessage, commandOutput, success );
 
-        addedFiles = new ArrayList( 0 );
+        addedFiles = new ArrayList<ScmFile>( 0 );
     }
 
-    public AddScmResult( String commandLine, List/*<ScmFile>*/ addedFiles )
+    public AddScmResult( String commandLine, List<ScmFile> addedFiles )
     {
         this( commandLine, null, null, true );
 
@@ -54,7 +57,7 @@ public class AddScmResult
         this.addedFiles = addedFiles;
     }
 
-    public AddScmResult( List/*<ScmFile>*/ addedFiles, ScmResult result )
+    public AddScmResult( List<ScmFile> addedFiles, ScmResult result )
     {
         super( result );
 
@@ -71,7 +74,7 @@ public class AddScmResult
      *
      * @return non null list of added files
      */
-    public List/*<ScmFile>*/ getAddedFiles()
+    public List<ScmFile> getAddedFiles()
     {
         return addedFiles;
     }

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java Fri Dec 31 15:18:11 2010
@@ -19,14 +19,13 @@ package org.apache.maven.scm.command.cha
  * under the License.
  */
 
-import org.apache.maven.scm.ChangeSet;
-import org.apache.maven.scm.ScmVersion;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
+import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.ScmVersion;
+
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -35,7 +34,7 @@ public class ChangeLogSet
 {
     public static final String DEFAULT_ENCODING = "ISO-8859-1";
 
-    private List/*<ChangeSet>*/ entries;
+    private List<ChangeSet> entries;
 
     private Date startDate;
 
@@ -64,7 +63,7 @@ public class ChangeLogSet
      * @param startDate the start date/tag for this set.
      * @param endDate   the end date/tag for this set, or <code>null</code> if this set goes to the present time.
      */
-    public ChangeLogSet( List/*<ChangeSet>*/ entries, Date startDate, Date endDate )
+    public ChangeLogSet( List<ChangeSet> entries, Date startDate, Date endDate )
     {
         this( startDate, endDate );
         setChangeSets( entries );
@@ -125,12 +124,12 @@ public class ChangeLogSet
      *
      * @return the collection of {@link org.apache.maven.scm.ChangeSet} objects for this set.
      */
-    public List/*<ChangeSet>*/ getChangeSets()
+    public List<ChangeSet> getChangeSets()
     {
         return entries;
     }
 
-    public void setChangeSets( List changeSets )
+    public void setChangeSets( List<ChangeSet> changeSets )
     {
         this.entries = changeSets;
     }
@@ -193,9 +192,9 @@ public class ChangeLogSet
         buffer.append( ">\n" );
 
         //  Write out the entries
-        for ( Iterator i = getChangeSets().iterator(); i.hasNext(); )
+        for ( ChangeSet changeSet : getChangeSets() )
         {
-            buffer.append( ( (ChangeSet) i.next() ).toXML() );
+            buffer.append( changeSet.toXML() );
         }
 
         buffer.append( "</changeset>\n" );

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java Fri Dec 31 15:18:11 2010
@@ -19,6 +19,7 @@ package org.apache.maven.scm.command.sta
  * under the License.
  */
 
+import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmResult;
 
 import java.util.Collections;
@@ -31,16 +32,18 @@ import java.util.List;
 public class StatusScmResult
     extends ScmResult
 {
-    private List changedFiles;
+    private static final long serialVersionUID = 7152442589455369403L;
+    
+    private List<ScmFile> changedFiles;
 
     public StatusScmResult( String commandLine, String providerMessage, String commandOutput, boolean success )
     {
         super( commandLine, providerMessage, commandOutput, success );
 
-        this.changedFiles = Collections.EMPTY_LIST;
+        this.changedFiles = Collections.emptyList();
     }
 
-    public StatusScmResult( String commandLine, List changedFiles )
+    public StatusScmResult( String commandLine, List<ScmFile> changedFiles )
     {
         super( commandLine, null, null, true );
 
@@ -52,7 +55,7 @@ public class StatusScmResult
         this.changedFiles = changedFiles;
     }
 
-    public StatusScmResult( List changedFiles, ScmResult result )
+    public StatusScmResult( List<ScmFile> changedFiles, ScmResult result )
     {
         super( result );
 
@@ -64,7 +67,7 @@ public class StatusScmResult
         this.changedFiles = changedFiles;
     }
 
-    public List getChangedFiles()
+    public List<ScmFile> getChangedFiles()
     {
         return changedFiles;
     }

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java Fri Dec 31 15:18:11 2010
@@ -33,16 +33,19 @@ import java.util.List;
 public class UpdateScmResult
     extends ScmResult
 {
-    private List updatedFiles;
+    
+    private static final long serialVersionUID = 1L;
+    
+    private List<ScmFile> updatedFiles;
 
-    private List changes;
+    private List<ChangeSet> changes;
 
     public UpdateScmResult( String commandLine, String providerMessage, String commandOutput, boolean success )
     {
         super( commandLine, providerMessage, commandOutput, success );
     }
 
-    public UpdateScmResult( String commandLine, List updatedFiles )
+    public UpdateScmResult( String commandLine, List<ScmFile> updatedFiles )
     {
         super( commandLine, null, null, true );
 
@@ -50,7 +53,7 @@ public class UpdateScmResult
        
     }
 
-    public UpdateScmResult( List updatedFiles, List changes, ScmResult result )
+    public UpdateScmResult( List<ScmFile> updatedFiles, List<ChangeSet> changes, ScmResult result )
     {
         super( result );
 
@@ -63,7 +66,7 @@ public class UpdateScmResult
      * 
      * @return List of {@link ScmFile}
      */
-    public List getUpdatedFiles()
+    public List<ScmFile> getUpdatedFiles()
     {
         return updatedFiles;
     }
@@ -71,16 +74,16 @@ public class UpdateScmResult
     /**
      * @return {@link List} of {@link ChangeSet}
      */
-    public List getChanges()
+    public List<ChangeSet> getChanges()
     {
         if ( changes == null )
         {
-            return new ArrayList();
+            return new ArrayList<ChangeSet>();
         }
         return changes;
     }
 
-    public void setChanges( List changes )
+    public void setChanges( List<ChangeSet> changes )
     {
         this.changes = changes;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml Fri Dec 31 15:18:11 2010
@@ -74,14 +74,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <systemProperties>

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java Fri Dec 31 15:18:11 2010
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.maven.scm.ChangeFile;
 import org.apache.maven.scm.ChangeSet;
 import org.apache.maven.scm.CommandParameter;
 import org.apache.maven.scm.CommandParameters;
@@ -359,9 +360,13 @@ public class AccuRevScmProvider
             {
                 String comment = "Cross stream update result from " + startVersion + " to " + endVersion;
                 String author = "";
-                @SuppressWarnings( "unchecked" )
                 List<ScmFile> files = result.getUpdatedFiles();
-                ChangeSet dummyChangeSet = new ChangeSet( new Date(), comment, author, files );
+                List<ChangeFile> changeFiles = new ArrayList<ChangeFile>( files.size() );
+                for (ScmFile scmFile : files)
+                {
+                    changeFiles.add(new ChangeFile( scmFile.getPath() ));
+                }
+                ChangeSet dummyChangeSet = new ChangeSet( new Date(), comment, author, changeFiles );
                 // different streams invalidates the change log, insert a dummy change instead.
                 List<ChangeSet> changeSets = Collections.singletonList( dummyChangeSet );
                 result.setChanges( changeSets );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddConsumer.java Fri Dec 31 15:18:11 2010
@@ -37,7 +37,7 @@ public class BazaarAddConsumer
 {
     private final File workingDir;
 
-    private final List addedFiles = new ArrayList();
+    private final List<ScmFile> addedFiles = new ArrayList<ScmFile>();
 
     public BazaarAddConsumer( ScmLogger logger, File workingDir )
     {
@@ -71,7 +71,7 @@ public class BazaarAddConsumer
         }
     }
 
-    public List getAddedFiles()
+    public List<ScmFile> getAddedFiles()
     {
         return addedFiles;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java Fri Dec 31 15:18:11 2010
@@ -137,10 +137,8 @@ public class ClearCaseAddCommand
 
         command.createArg().setValue( "-nco" );
 
-        File[] files = scmFileSet.getFiles();
-        for ( int i = 0; i < files.length; i++ )
+        for ( File file : scmFileSet.getFileList() )
         {
-            File file = files[i];
             command.createArg().setValue( file.getName() );
         }
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java Fri Dec 31 15:18:11 2010
@@ -36,7 +36,7 @@ public class ClearCaseAddConsumer
 {
     private ScmLogger logger;
 
-    private List addedFiles = new ArrayList();
+    private List<ScmFile> addedFiles = new ArrayList<ScmFile>();
 
     // ----------------------------------------------------------------------
     //
@@ -70,7 +70,7 @@ public class ClearCaseAddConsumer
     //
     // ----------------------------------------------------------------------
 
-    public List getAddedFiles()
+    public List<ScmFile> getAddedFiles()
     {
         return addedFiles;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.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/add/HgAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddCommand.java Fri Dec 31 15:18:11 2010
@@ -20,10 +20,11 @@ package org.apache.maven.scm.provider.hg
  */
 
 import java.io.File;
-import java.util.Iterator;
 
 import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.ScmResult;
 import org.apache.maven.scm.command.Command;
 import org.apache.maven.scm.command.add.AbstractAddCommand;
@@ -59,13 +60,12 @@ public class HgAddCommand
 
         // add in bogus 'added' results for empty directories.  only need to do this because the maven scm unit test
         // framework seems to think that this is the way we should behave.  it's pretty hacky. -rwd
-        for ( Iterator iterator = fileSet.getFileList().iterator(); iterator.hasNext(); )
+        for ( File workingFile : fileSet.getFileList() )
         {
-            File workingFile = (File) iterator.next();
             File file = new File( workingDir + "/" + workingFile.getPath() );
             if ( file.isDirectory() && file.listFiles().length == 0 )
             {
-                addScmResult.getAddedFiles().add( workingFile );
+                addScmResult.getAddedFiles().add( new ScmFile( workingFile.getPath(), ScmFileStatus.ADDED ) );
             }
         }
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.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/add/HgAddConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java Fri Dec 31 15:18:11 2010
@@ -37,7 +37,7 @@ public class HgAddConsumer
 {
     private final File workingDir;
 
-    private final List addedFiles = new ArrayList();
+    private final List<ScmFile> addedFiles = new ArrayList<ScmFile>();
 
     public HgAddConsumer( ScmLogger logger, File workingDir )
     {
@@ -71,7 +71,7 @@ public class HgAddConsumer
         }
     }
 
-    public List getAddedFiles()
+    public List<ScmFile> getAddedFiles()
     {
         return addedFiles;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.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/add/LocalAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.java Fri Dec 31 15:18:11 2010
@@ -49,11 +49,10 @@ public class LocalAddCommand
     {
         LocalScmProviderRepository localRepo = (LocalScmProviderRepository) repository;
 
-        File[] files = fileSet.getFiles();
-        List fileList = new ArrayList();
-        for ( int i = 0; i < files.length; i++ )
+        List<ScmFile> fileList = new ArrayList<ScmFile>();
+        for ( File file : fileSet.getFileList() )
         {
-            String path = files[i].getPath().replace( '\\', '/' );
+            String path = file.getPath().replace( '\\', '/' );
             localRepo.addFile( path );
             fileList.add( new ScmFile( path, ScmFileStatus.ADDED ) );
         }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.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/add/PerforceAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java Fri Dec 31 15:18:11 2010
@@ -19,6 +19,8 @@ package org.apache.maven.scm.provider.pe
  * under the License.
  */
 
+import java.io.File;
+
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmResult;
@@ -32,9 +34,6 @@ import org.codehaus.plexus.util.cli.Comm
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 
-import java.io.File;
-import java.util.List;
-
 /**
  * @author Mike Perham
  * @version $Id$
@@ -83,10 +82,8 @@ public class PerforceAddCommand
         Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
         command.createArg().setValue( "add" );
 
-        List fs = files.getFileList();
-        for ( int i = 0; i < fs.size(); i++ )
+        for ( File file : files.getFileList() )
         {
-            File file = (File) fs.get( i );
             command.createArg().setValue( file.getName() );
         }
         return command;

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.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/add/PerforceAddConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumer.java Fri Dec 31 15:18:11 2010
@@ -19,13 +19,15 @@ package org.apache.maven.scm.provider.pe
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
 import org.apache.regexp.RE;
 import org.apache.regexp.RESyntaxException;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author Mike Perham
  * @version $Id: PerforceChangeLogConsumer.java 331276 2005-11-07 15:04:54Z
@@ -39,7 +41,7 @@ public class PerforceAddConsumer
 
     private static final String FILE_BEGIN_TOKEN = "//";
 
-    private List additions = new ArrayList();
+    private List<ScmFile> additions = new ArrayList<ScmFile>();
 
     private RE revisionRegexp;
 
@@ -55,7 +57,7 @@ public class PerforceAddConsumer
         }
     }
 
-    public List getAdditions()
+    public List<ScmFile> getAdditions()
     {
         return additions;
     }
@@ -80,6 +82,6 @@ public class PerforceAddConsumer
             throw new IllegalStateException( "Unknown input: " + line );
         }
 
-        additions.add( revisionRegexp.getParen( 1 ) );
+        additions.add( new ScmFile( revisionRegexp.getParen( 1 ), ScmFileStatus.ADDED ) );
     }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java Fri Dec 31 15:18:11 2010
@@ -63,13 +63,8 @@ public class StarteamAddCommand
 
         CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
 
-        //File basedir = fileSet.getBasedir();
-
-        List files = fileSet.getFileList();
-
-        for ( int i = 0; i < files.size(); ++i )
+        for ( File fileToBeAdded : fileSet.getFileList() )
         {
-            File fileToBeAdded = (File) fileSet.getFileList().get( i );
             ScmFileSet scmFile = new ScmFileSet( fileSet.getBasedir(), fileToBeAdded );
 
             Commandline cl = createCommandLine( repository, scmFile, issue );
@@ -87,7 +82,7 @@ public class StarteamAddCommand
 
     static Commandline createCommandLine( StarteamScmProviderRepository repo, ScmFileSet scmFileSet, String issue )
     {
-        List args = new ArrayList();
+        List<String> args = new ArrayList<String>();
 
         if ( issue != null && issue.length() != 0 )
         {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java Fri Dec 31 15:18:11 2010
@@ -45,7 +45,7 @@ public class StarteamAddConsumer
      */
     private String currentDir;
 
-    private List files = new ArrayList();
+    private List<ScmFile> files = new ArrayList<ScmFile>();
 
     /**
      * Marks current directory data
@@ -100,7 +100,7 @@ public class StarteamAddConsumer
         }
     }
 
-    public List getAddedFiles()
+    public List<ScmFile> getAddedFiles()
     {
         return files;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java Fri Dec 31 15:18:11 2010
@@ -19,8 +19,15 @@ package org.apache.maven.scm.provider.sy
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.ScmResult;
 import org.apache.maven.scm.command.add.AbstractAddCommand;
 import org.apache.maven.scm.command.add.AddScmResult;
@@ -30,10 +37,6 @@ import org.apache.maven.scm.provider.syn
 import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
 import org.codehaus.plexus.util.FileUtils;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-
 /**
  * @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
  * @version $Id$
@@ -77,11 +80,9 @@ public class SynergyAddCommand
             }
             File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
             File destPath = new File( waPath, repo.getProjectName() );
-            for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
+            for ( File source : fileSet.getFileList() )
             {
-                File f = (File) i.next();
-                File source = f;
-                File dest = new File( destPath, SynergyUtil.removePrefix( fileSet.getBasedir(), f ) );
+                File dest = new File( destPath, SynergyUtil.removePrefix( fileSet.getBasedir(), source ) );
                 if ( !source.equals( dest ) )
                 {
                     if ( getLogger().isDebugEnabled() )
@@ -106,8 +107,12 @@ public class SynergyAddCommand
         {
             SynergyUtil.stop( getLogger(), ccmAddr );
         }
-
-        return new AddScmResult( "", fileSet.getFileList() );
+        List<ScmFile> scmFiles = new ArrayList<ScmFile>(fileSet.getFileList().size());
+        for (File f : fileSet.getFileList())
+        {
+            scmFiles.add( new ScmFile( f.getPath(), ScmFileStatus.ADDED ) );
+        }
+        return new AddScmResult( "", scmFiles );
     }
 
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java Fri Dec 31 15:18:11 2010
@@ -19,9 +19,14 @@ package org.apache.maven.scm.provider.sy
  * under the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.ScmResult;
 import org.apache.maven.scm.command.remove.AbstractRemoveCommand;
 import org.apache.maven.scm.command.status.StatusScmResult;
@@ -30,9 +35,6 @@ import org.apache.maven.scm.provider.syn
 import org.apache.maven.scm.provider.synergy.repository.SynergyScmProviderRepository;
 import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
 
-import java.io.File;
-import java.util.Iterator;
-
 /**
  * @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
  * @version $Id$
@@ -69,9 +71,8 @@ public class SynergyRemoveCommand
             }
             File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
             File destPath = new File( waPath, repo.getProjectName() );
-            for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
+            for ( File f : fileSet.getFileList() )
             {
-                ScmFile f = (ScmFile) i.next();
                 File source = new File( fileSet.getBasedir(), f.getPath() );
                 File dest = new File( destPath, f.getPath() );
                 SynergyUtil.delete( getLogger(), dest, ccmAddr, false );
@@ -89,8 +90,12 @@ public class SynergyRemoveCommand
         {
             SynergyUtil.stop( getLogger(), ccmAddr );
         }
-
-        return new StatusScmResult( "", fileSet.getFileList() );
+        List<ScmFile> scmFiles = new ArrayList<ScmFile>();
+        for (File file : fileSet.getFileList())
+        {
+            scmFiles.add( new ScmFile( file.getPath(), ScmFileStatus.DELETED ) );
+        }
+        return new StatusScmResult( "", scmFiles );
     }
 
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java Fri Dec 31 15:18:11 2010
@@ -35,7 +35,7 @@ public class FileListConsumer
 
     protected String currentDir = "";
 
-    private ArrayList files = new ArrayList();
+    private List<ScmFile> files = new ArrayList<ScmFile>();
 
     public void consumeLine( String line )
     {
@@ -69,7 +69,7 @@ public class FileListConsumer
         return new ScmFile( new File( currentDir, filename ).getAbsolutePath(), ScmFileStatus.CHECKED_OUT );
     }
 
-    public List getFiles()
+    public List<ScmFile> getFiles()
     {
         return files;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.java Fri Dec 31 15:18:11 2010
@@ -46,7 +46,7 @@ public class VssAddCommand
     {
         VssScmProviderRepository repo = (VssScmProviderRepository) repository;
 
-        if ( fileSet.getFiles().length == 0 )
+        if ( fileSet.getFileList().isEmpty() )
         {
             throw new ScmException( "You must provide at least one file/directory to add" );
         }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddConsumer.java Fri Dec 31 15:18:11 2010
@@ -36,7 +36,7 @@ public class VssAddConsumer
 {
     private ScmLogger logger;
 
-    private List addedFiles = new ArrayList();
+    private List<ScmFile> addedFiles = new ArrayList<ScmFile>();
 
     // ----------------------------------------------------------------------
     //
@@ -87,7 +87,7 @@ public class VssAddConsumer
         addedFiles.add( new ScmFile( file, status ) );
     }
 
-    public List getAddedFiles()
+    public List<ScmFile> getAddedFiles()
     {
         return addedFiles;
     }

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/command/add/AbstractCvsAddCommand.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/command/add/AbstractCvsAddCommand.java?rev=1054126&r1=1054125&r2=1054126&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/command/add/AbstractCvsAddCommand.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/command/add/AbstractCvsAddCommand.java Fri Dec 31 15:18:11 2010
@@ -66,13 +66,12 @@ public abstract class AbstractCvsAddComm
             cl.createArg().setValue( "\"" + message + "\"" );
         }
 
-        File[] files = fileSet.getFiles();
 
-        List addedFiles = new ArrayList();
+        List<ScmFile> addedFiles = new ArrayList<ScmFile>( fileSet.getFileList().size() );
 
-        for ( int i = 0; i < files.length; i++ )
+        for ( File file : fileSet.getFileList() )
         {
-            String path = files[i].getPath().replace( '\\', '/' );
+            String path = file.getPath().replace( '\\', '/' );
 
             cl.createArg().setValue( path );
 
@@ -88,6 +87,6 @@ public abstract class AbstractCvsAddComm
         return executeCvsCommand( cl, addedFiles );
     }
 
-    protected abstract AddScmResult executeCvsCommand( Commandline cl, List/*<ScmFile>*/ addedFiles )
+    protected abstract AddScmResult executeCvsCommand( Commandline cl, List<ScmFile> addedFiles )
         throws ScmException;
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/add/CvsExeAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/add/CvsExeAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/add/CvsExeAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/add/CvsExeAddCommand.java Fri Dec 31 15:18:11 2010
@@ -19,15 +19,16 @@ package org.apache.maven.scm.provider.cv
  * under the License.
  */
 
+import java.util.List;
+
 import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.command.add.AddScmResult;
 import org.apache.maven.scm.provider.cvslib.command.add.AbstractCvsAddCommand;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 
-import java.util.List;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -36,7 +37,7 @@ public class CvsExeAddCommand
     extends AbstractCvsAddCommand
 {
     /** {@inheritDoc} */
-    protected AddScmResult executeCvsCommand( Commandline cl, List addedFiles )
+    protected AddScmResult executeCvsCommand( Commandline cl, List<ScmFile> addedFiles )
         throws ScmException
     {
         CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/add/CvsJavaAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/add/CvsJavaAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/add/CvsJavaAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/add/CvsJavaAddCommand.java Fri Dec 31 15:18:11 2010
@@ -19,15 +19,16 @@ package org.apache.maven.scm.provider.cv
  * under the License.
  */
 
+import java.util.List;
+
 import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.command.add.AddScmResult;
 import org.apache.maven.scm.provider.cvslib.command.add.AbstractCvsAddCommand;
 import org.apache.maven.scm.provider.cvslib.cvsjava.util.CvsConnection;
 import org.apache.maven.scm.provider.cvslib.cvsjava.util.CvsLogListener;
 import org.codehaus.plexus.util.cli.Commandline;
 
-import java.util.List;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -36,7 +37,7 @@ public class CvsJavaAddCommand
     extends AbstractCvsAddCommand
 {
     /** {@inheritDoc} */
-    protected AddScmResult executeCvsCommand( Commandline cl, List addedFiles )
+    protected AddScmResult executeCvsCommand( Commandline cl, List<ScmFile> addedFiles )
         throws ScmException
     {
         CvsLogListener logListener = new CvsLogListener();

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java Fri Dec 31 15:18:11 2010
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.gi
  * under the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
@@ -34,11 +38,6 @@ import org.apache.maven.scm.provider.git
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
  * @version $Id$
@@ -88,17 +87,14 @@ public class GitAddCommand
             }
         }
 
-        List changedFiles = new ArrayList();
+        List<ScmFile> changedFiles = new ArrayList<ScmFile>();
 
         // rewrite all detected files to now have status 'checked_in'
-        for ( Iterator it = statusConsumer.getChangedFiles().iterator(); it.hasNext(); )
+        for ( ScmFile scmfile : statusConsumer.getChangedFiles() )
         {
-            ScmFile scmfile = (ScmFile) it.next();
-
             // if a specific fileSet is given, we have to check if the file is really tracked
-            for ( Iterator itfl = fileSet.getFileList().iterator(); itfl.hasNext(); )
+            for ( File f : fileSet.getFileList() )
             {
-                File f = (File) itfl.next();
                 if ( f.toString().equals( scmfile.getPath() ) )
                 {
                     changedFiles.add( scmfile );
@@ -108,7 +104,7 @@ public class GitAddCommand
         return new AddScmResult( cl.toString(), changedFiles );
     }
 
-    public static Commandline createCommandLine( File workingDirectory, List/*File*/files )
+    public static Commandline createCommandLine( File workingDirectory, List<File> files )
         throws ScmException
     {
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "add" );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java Fri Dec 31 15:18:11 2010
@@ -72,7 +72,7 @@ public class GitStatusConsumer
 
     private File workingDirectory;
 
-    private List changedFiles = new ArrayList();
+    private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
 
     // ----------------------------------------------------------------------
     //
@@ -147,7 +147,7 @@ public class GitStatusConsumer
 
     }
 
-    public List getChangedFiles()
+    public List<ScmFile> getChangedFiles()
     {
         return changedFiles;
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java Fri Dec 31 15:18:11 2010
@@ -50,6 +50,6 @@ public class GitExeBlameCommandTckTest
         assertEquals( "Expected 1 line in blame", 1, lines.size() );
         BlameLine line = (BlameLine) lines.get( 0 );
         assertEquals( "Mark Struberg", line.getAuthor() );
-        assertEquals( "92f139df", line.getRevision() );
+        assertEquals( "92f139dfec4d1dfb79c3cd2f94e83bf13129668b", line.getRevision() );
     }
 }

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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java?rev=1054126&r1=1054125&r2=1054126&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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java Fri Dec 31 15:18:11 2010
@@ -19,16 +19,15 @@ package org.apache.maven.scm.provider.sv
  * under the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.log.ScmLogger;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
  * @version $Id$
@@ -40,7 +39,7 @@ public abstract class AbstractFileChecki
 
     protected File workingDirectory;
 
-    private List files = new ArrayList();
+    private List<ScmFile> files = new ArrayList<ScmFile>();
 
     protected int revision;
 
@@ -70,19 +69,18 @@ public abstract class AbstractFileChecki
 
     protected abstract void parseLine( String line );
 
-    protected List getFiles()
+    protected List<ScmFile> getFiles()
     {
         
         if ( !filtered )
         {
-            for ( Iterator it = files.iterator(); it.hasNext(); )
+            for ( ScmFile file : files )
             {
-                ScmFile file = (ScmFile) it.next();
 
                 if ( !file.getStatus().equals( ScmFileStatus.DELETED )
                     && !new File( workingDirectory, file.getPath() ).isFile() )
                 {
-                    it.remove();
+                    files.remove( file );
                 }
             }
 

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/add/SvnAddCommand.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/add/SvnAddCommand.java?rev=1054126&r1=1054125&r2=1054126&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/add/SvnAddCommand.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/add/SvnAddCommand.java Fri Dec 31 15:18:11 2010
@@ -54,7 +54,7 @@ public class SvnAddCommand
             throw new ScmException( "This provider does not yet support binary files" );
         }
 
-        if ( fileSet.getFiles().length == 0 )
+        if ( fileSet.getFileList().isEmpty() )
         {
             throw new ScmException( "You must provide at least one file/directory to add" );
         }
@@ -90,7 +90,7 @@ public class SvnAddCommand
         return new AddScmResult( cl.toString(), consumer.getAddedFiles() );
     }
 
-    private static Commandline createCommandLine( File workingDirectory, List/*File*/ files )
+    private static Commandline createCommandLine( File workingDirectory, List<File> files )
         throws ScmException
     {
         // Base command line doesn't make sense here - username/password not needed, and non-interactive is not valid

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/add/SvnAddConsumer.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/add/SvnAddConsumer.java?rev=1054126&r1=1054125&r2=1054126&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/add/SvnAddConsumer.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/add/SvnAddConsumer.java Fri Dec 31 15:18:11 2010
@@ -36,7 +36,7 @@ public class SvnAddConsumer
 {
     private ScmLogger logger;
 
-    private List addedFiles = new ArrayList();
+    private List<ScmFile> addedFiles = new ArrayList<ScmFile>();
 
     // ----------------------------------------------------------------------
     //
@@ -87,7 +87,7 @@ public class SvnAddConsumer
         addedFiles.add( new ScmFile( file, status ) );
     }
 
-    public List getAddedFiles()
+    public List<ScmFile> getAddedFiles()
     {
         return addedFiles;
     }

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/update/SvnUpdateCommand.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/update/SvnUpdateCommand.java?rev=1054126&r1=1054125&r2=1054126&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/update/SvnUpdateCommand.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/update/SvnUpdateCommand.java Fri Dec 31 15:18:11 2010
@@ -20,12 +20,9 @@ package org.apache.maven.scm.provider.sv
  */
 
 import java.io.File;
-import java.util.Iterator;
 
-import org.apache.maven.scm.ChangeSet;
 import org.apache.maven.scm.ScmBranch;
 import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTag;
 import org.apache.maven.scm.ScmVersion;

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/update/SvnUpdateConsumer.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/update/SvnUpdateConsumer.java?rev=1054126&r1=1054125&r2=1054126&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/update/SvnUpdateConsumer.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/update/SvnUpdateConsumer.java Fri Dec 31 15:18:11 2010
@@ -46,7 +46,7 @@ public class SvnUpdateConsumer
 
     private static final String RESTORED_TOKEN = "Restored";
     
-    private List /* ChangeSet */ changeSets = new ArrayList();
+    private List<ChangeSet> changeSets = new ArrayList<ChangeSet>();
 
     // ----------------------------------------------------------------------
     //
@@ -126,7 +126,7 @@ public class SvnUpdateConsumer
 
         addFile( new ScmFile( file, status ) );
         
-        List /** ChangeFile */
+        List<ChangeFile>
         changeFiles =
             Arrays.asList( new ChangeFile[] { new ChangeFile( line, Integer.valueOf( revision ).toString() ) } );
 
@@ -134,17 +134,17 @@ public class SvnUpdateConsumer
         changeSets.add( changeSet );
     }
 
-    public List getUpdatedFiles()
+    public List<ScmFile> getUpdatedFiles()
     {
         return getFiles();
     }
 
-    public List getChangeSets()
+    public List<ChangeSet> getChangeSets()
     {
         return changeSets;
     }
 
-    public void setChangeSets( List changeSets )
+    public void setChangeSets( List<ChangeSet> changeSets )
     {
         this.changeSets = changeSets;
     }

Modified: maven/scm/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=1054126&r1=1054125&r2=1054126&view=diff
==============================================================================
--- maven/scm/trunk/pom.xml (original)
+++ maven/scm/trunk/pom.xml Fri Dec 31 15:18:11 2010
@@ -285,6 +285,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.3.2</version>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
         </plugin>        
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message