You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2011/01/02 15:05:27 UTC
svn commit: r1054408 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/
maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/
maven-scm-providers/mave...
Author: olamy
Date: Sun Jan 2 14:05:25 2011
New Revision: 1054408
URL: http://svn.apache.org/viewvc?rev=1054408&view=rev
Log:
[SCM-591] move to Java 1.5 : changelog command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangesConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/TfsChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.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/changelog/CvsChangeLogConsumer.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/changelog/GitChangeLogCommand.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/changelog/GitChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -33,6 +33,7 @@ import org.apache.maven.scm.provider.Scm
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public abstract class AbstractChangeLogCommand
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java Sun Jan 2 14:05:25 2011
@@ -23,11 +23,13 @@ import org.apache.maven.scm.ScmResult;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ChangeLogScmResult
extends ScmResult
{
+ private static final long serialVersionUID = 559431861541372265L;
private ChangeLogSet changeLog;
public ChangeLogScmResult( String commandLine, String providerMessage, String commandOutput, boolean success )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.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/changelog/BazaarChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -19,11 +19,15 @@ package org.apache.maven.scm.provider.ba
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
@@ -32,13 +36,9 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class BazaarChangeLogCommand
@@ -55,14 +55,13 @@ public class BazaarChangeLogCommand
BazaarChangeLogConsumer consumer = new BazaarChangeLogConsumer( getLogger(), datePattern );
ScmResult result = BazaarUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd );
- List logEntries = consumer.getModifications();
- List inRangeAndValid = new ArrayList();
+ List<ChangeSet> logEntries = consumer.getModifications();
+ List<ChangeSet> inRangeAndValid = new ArrayList<ChangeSet>();
startDate = startDate == null ? new Date( 0 ) : startDate; //From 1. Jan 1970
endDate = endDate == null ? new Date() : endDate; //Upto now
- for ( Iterator it = logEntries.iterator(); it.hasNext(); )
+ for ( ChangeSet change : logEntries )
{
- ChangeSet change = (ChangeSet) it.next();
if ( change.getFiles().size() > 0 )
{
if ( !change.getDate().before( startDate ) && !change.getDate().after( endDate ) )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.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/changelog/BazaarChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -30,7 +30,8 @@ import java.util.Date;
import java.util.List;
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class BazaarChangeLogConsumer
@@ -53,7 +54,7 @@ public class BazaarChangeLogConsumer
private static final String MERGED_TOKEN = "merged: ";
- private List logEntries = new ArrayList();
+ private List<ChangeSet> logEntries = new ArrayList<ChangeSet>();
private ChangeSet currentChange;
@@ -79,7 +80,7 @@ public class BazaarChangeLogConsumer
this.userDatePattern = userDatePattern;
}
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
return logEntries;
}
@@ -104,7 +105,7 @@ public class BazaarChangeLogConsumer
//Init a new changeset
currentChange = new ChangeSet();
- currentChange.setFiles( new ArrayList() );
+ currentChange.setFiles( new ArrayList<ChangeFile>() );
logEntries.add( currentChange );
//Reset memeber vars
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.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/changelog/ClearCaseChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -44,6 +44,7 @@ import java.util.Locale;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:frederic.mura@laposte.net">Frederic Mura</a>
* @author <a href="mailto:m.holster@anva.nl">Mark Holster</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseChangeLogCommand
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.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/changelog/ClearCaseChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -30,6 +30,7 @@ import java.util.List;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseChangeLogConsumer
@@ -48,7 +49,7 @@ public class ClearCaseChangeLogConsumer
private static final String COMMENT_TAG = "COMM:";
- private List entries = new ArrayList();
+ private List<ChangeSet> entries = new ArrayList<ChangeSet>();
// state machine constants for reading clearcase lshistory command output
@@ -99,7 +100,7 @@ public class ClearCaseChangeLogConsumer
//
// ----------------------------------------------------------------------
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
return entries;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.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/changelog/HgChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.hg
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
@@ -32,13 +36,9 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.provider.hg.HgUtils;
import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class HgChangeLogCommand
@@ -55,14 +55,13 @@ public class HgChangeLogCommand
HgChangeLogConsumer consumer = new HgChangeLogConsumer( getLogger(), datePattern );
ScmResult result = HgUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd );
- List logEntries = consumer.getModifications();
- List inRangeAndValid = new ArrayList();
+ List<ChangeSet> logEntries = consumer.getModifications();
+ List<ChangeSet> inRangeAndValid = new ArrayList<ChangeSet>();
startDate = startDate == null ? new Date( 0 ) : startDate; // From 1. Jan 1970
endDate = endDate == null ? new Date() : endDate; // Upto now
- for ( Iterator it = logEntries.iterator(); it.hasNext(); )
+ for ( ChangeSet change : logEntries )
{
- ChangeSet change = (ChangeSet) it.next();
if ( change.getFiles().size() > 0 )
{
if ( !change.getDate().before( startDate ) && !change.getDate().after( endDate ) )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.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/changelog/HgChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -58,7 +58,7 @@ public class HgChangeLogConsumer
private String prevPrevLine = "";
- private ArrayList logEntries = new ArrayList();
+ private List<ChangeSet> logEntries = new ArrayList<ChangeSet>();
private ChangeSet currentChange;
@@ -68,13 +68,14 @@ public class HgChangeLogConsumer
private String currentRevision;
+ @SuppressWarnings( "unused" )
private String currentTag; // don't know what to do with this
private String userDatePattern;
private boolean spoolingComments;
- private List currentComment = null;
+ private List<String> currentComment = null;
public HgChangeLogConsumer( ScmLogger logger, String userDatePattern )
{
@@ -83,7 +84,7 @@ public class HgChangeLogConsumer
this.userDatePattern = userDatePattern;
}
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
return logEntries;
}
@@ -134,11 +135,11 @@ public class HgChangeLogConsumer
//Init a new changeset
currentChange = new ChangeSet();
- currentChange.setFiles( new ArrayList() );
+ currentChange.setFiles( new ArrayList<ChangeFile>( 0 ) );
logEntries.add( currentChange );
//Reset memeber vars
- currentComment = new ArrayList();
+ currentComment = new ArrayList<String>();
currentRevision = "";
isMergeEntry = false;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.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/changelog/LocalChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -19,6 +19,12 @@ package org.apache.maven.scm.provider.lo
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
import org.apache.maven.scm.ChangeFile;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
@@ -31,16 +37,9 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.provider.local.repository.LocalScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class LocalChangeLogCommand
@@ -83,24 +82,23 @@ public class LocalChangeLogCommand
throw new ScmException( "The module directory doesn't exist (" + source.getAbsolutePath() + ")." );
}
- List changeLogList = new ArrayList();
+ List<ChangeSet> changeLogList = new ArrayList<ChangeSet>();
try
{
File repoRoot = new File( repo.getRoot(), repo.getModule() );
- List files = Arrays.asList( fileSet.getFiles() );
+ List<File> files = fileSet.getFileList();
if ( files.isEmpty() )
{
- files = FileUtils.getFiles( baseDestination, "**", null, false );
+ @SuppressWarnings( "unchecked" )
+ List<File> fileList = FileUtils.getFiles( baseDestination, "**", null, false );
+ files = fileList;
}
- Iterator it = files.iterator();
-
- while ( it.hasNext() )
+ for ( File file : files )
{
- File file = (File) it.next();
String path = file.getPath().replace( '\\', '/' );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -19,10 +19,15 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmRevision;
import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
@@ -36,15 +41,9 @@ 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.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class PerforceChangeLogCommand
@@ -117,14 +116,15 @@ public class PerforceChangeLogCommand
}
}
- List changes = consumer.getChanges();
+ List<String> changes = consumer.getChanges();
cl = PerforceScmProvider.createP4Command( p4repo, fileSet.getBasedir() );
cl.createArg().setValue( "describe" );
cl.createArg().setValue( "-s" );
- for( int i = 0; i < changes.size(); i++ ) {
- cl.createArg().setValue( (String)changes.get(i) );
+ for( String change : changes )
+ {
+ cl.createArg().setValue( change );
}
PerforceDescribeConsumer describeConsumer =
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangesConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangesConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangesConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangesConsumer.java Sun Jan 2 14:05:25 2011
@@ -30,12 +30,13 @@ import java.util.List;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class PerforceChangesConsumer
extends AbstractConsumer
{
- private List entries = new ArrayList();
+ private List<String> entries = new ArrayList<String>();
/**
* The regular expression used to match header lines
@@ -63,7 +64,7 @@ public class PerforceChangesConsumer
}
}
- public List getChanges() throws ScmException
+ public List<String> getChanges() throws ScmException
{
return entries;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumer.java Sun Jan 2 14:05:25 2011
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.ChangeFile;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmException;
@@ -27,26 +30,18 @@ import org.apache.maven.scm.util.Abstrac
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
/**
* Parse the tagged output from "p4 describe -s [change] [change] [...]".
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class PerforceDescribeConsumer
extends AbstractConsumer
{
- /**
- * Date formatter for perforce timestamp
- */
- private static final String PERFORCE_TIMESTAMP_PATTERN = "yyyy/MM/dd HH:mm:ss";
-
- private List entries = new ArrayList();
+
+ private List<ChangeSet> entries = new ArrayList<ChangeSet>();
/**
* State machine constant: expecting revision
@@ -86,6 +81,7 @@ public class PerforceDescribeConsumer
/**
* The current log entry being processed by the parser
*/
+ @SuppressWarnings( "unused" )
private String currentRevision;
/**
@@ -155,7 +151,7 @@ public class PerforceDescribeConsumer
//
// ----------------------------------------------------------------------
- public List getModifications() throws ScmException
+ public List<ChangeSet> getModifications() throws ScmException
{
return entries;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.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/changelog/StarteamChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -38,6 +38,7 @@ import java.util.Date;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class StarteamChangeLogCommand
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.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/changelog/StarteamChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -34,6 +34,7 @@ import java.util.Locale;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class StarteamChangeLogConsumer
@@ -41,7 +42,7 @@ public class StarteamChangeLogConsumer
{
private SimpleDateFormat localFormat = new SimpleDateFormat( "", Locale.getDefault() );
- private List entries = new ArrayList();
+ private List<ChangeSet> entries = new ArrayList<ChangeSet>();
private String workingDirectory;
@@ -165,7 +166,7 @@ public class StarteamChangeLogConsumer
//
// ----------------------------------------------------------------------
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
return entries;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.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/changelog/SynergyChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.sy
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
@@ -32,13 +36,9 @@ import org.apache.maven.scm.provider.syn
import org.apache.maven.scm.provider.synergy.util.SynergyTask;
import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SynergyChangeLogCommand
@@ -66,7 +66,7 @@ public class SynergyChangeLogCommand
String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
- List csList = new ArrayList();
+ List<ChangeSet> csList = new ArrayList<ChangeSet>();
try
{
@@ -76,11 +76,10 @@ public class SynergyChangeLogCommand
{
throw new ScmException( "You should checkout project first" );
}
- List tasks = SynergyUtil.getCompletedTasks( getLogger(), projectSpec, startDate, endDate, ccmAddr );
- for ( Iterator i = tasks.iterator(); i.hasNext(); )
+ List<SynergyTask> tasks = SynergyUtil.getCompletedTasks( getLogger(), projectSpec, startDate, endDate, ccmAddr );
+ for (SynergyTask t : tasks )
{
ChangeSet cs = new ChangeSet();
- SynergyTask t = ( (SynergyTask) i.next() );
cs.setAuthor( t.getUsername() );
cs.setComment( "Task " + t.getNumber() + ": " + t.getComment() );
cs.setDate( t.getModifiedTime() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.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/consumer/SynergyGetCompletedTasksConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java Sun Jan 2 14:05:25 2011
@@ -54,12 +54,12 @@ public class SynergyGetCompletedTasksCon
public static final String OUTPUT_FORMAT = "%displayname" + SynergyUtil.SEPARATOR + "%owner"
+ SynergyUtil.SEPARATOR + "%completion_date" + SynergyUtil.SEPARATOR + "%task_synopsis" + SynergyUtil.SEPARATOR;
- private List entries = new ArrayList();
+ private List<SynergyTask> entries = new ArrayList<SynergyTask>();
/**
* @return the tasks
*/
- public List getTasks()
+ public List<SynergyTask> getTasks()
{
return entries;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.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/consumer/SynergyGetTaskObjectsConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java Sun Jan 2 14:05:25 2011
@@ -32,13 +32,14 @@ import java.util.StringTokenizer;
* Mainly inspired from CruiseControl
*
* @author <a href="julien.henry@capgemini.com">Julien Henry</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SynergyGetTaskObjectsConsumer
extends AbstractConsumer
{
- private List entries = new ArrayList();
+ private List<ChangeFile> entries = new ArrayList<ChangeFile>();
public static final String OUTPUT_FORMAT = "%name" + SynergyUtil.SEPARATOR + // 0
"%version" + SynergyUtil.SEPARATOR;
@@ -46,7 +47,7 @@ public class SynergyGetTaskObjectsConsum
/**
* @return the entries
*/
- public List getFiles()
+ public List<ChangeFile> getFiles()
{
return entries;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.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/consumer/SynergyGetWorkingFilesConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java Sun Jan 2 14:05:25 2011
@@ -27,6 +27,7 @@ import java.util.List;
/**
* @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SynergyGetWorkingFilesConsumer
@@ -34,7 +35,7 @@ public class SynergyGetWorkingFilesConsu
{
private ScmLogger logger;
- private List files = new ArrayList();
+ private List<String> files = new ArrayList<String>();
public static final String OUTPUT_FORMAT = "%name";
@@ -56,7 +57,7 @@ public class SynergyGetWorkingFilesConsu
}
}
- public List getFiles()
+ public List<String> getFiles()
{
return files;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.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/util/SynergyCCM.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java Sun Jan 2 14:05:25 2011
@@ -632,7 +632,7 @@ public class SynergyCCM
* @return
* @throws ScmException
*/
- public static Commandline checkinFiles( List files, String comment, String ccmAddr )
+ public static Commandline checkinFiles( List<File> files, String comment, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.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/util/SynergyUtil.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java Sun Jan 2 14:05:25 2011
@@ -19,6 +19,15 @@ package org.apache.maven.scm.provider.sy
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.maven.scm.ChangeFile;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.log.ScmLogger;
@@ -34,18 +43,11 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.StreamConsumer;
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
/**
* This class contains functional methodsfor Synergy.
*
* @author <a href="mailto:julien.henry@capgemini.com">Julien Henry</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SynergyUtil
@@ -131,7 +133,7 @@ public class SynergyUtil
* @param ccmAddr Synergy session ID.
* @return list of working files.
*/
- public static List getWorkingFiles( ScmLogger logger, String projectSpec, String release, String ccmAddr )
+ public static List<String> getWorkingFiles( ScmLogger logger, String projectSpec, String release, String ccmAddr )
throws ScmException
{
if ( logger.isDebugEnabled() )
@@ -165,7 +167,7 @@ public class SynergyUtil
* @param numTask task number.
* @param ccmAddr Synergy session ID.
*/
- public static List getModifiedObjects( ScmLogger logger, int numTask, String ccmAddr )
+ public static List<ChangeFile> getModifiedObjects( ScmLogger logger, int numTask, String ccmAddr )
throws ScmException
{
if ( logger.isDebugEnabled() )
@@ -199,9 +201,9 @@ public class SynergyUtil
* @param startDate start date.
* @param endDate end date.
* @param ccmAddr Synergy session ID.
- * @return A list of <code>Task</code>
+ * @return A list of {@link SynergyTask}
*/
- public static List getCompletedTasks( ScmLogger logger, String projectSpec, Date startDate, Date endDate,
+ public static List<SynergyTask> getCompletedTasks( ScmLogger logger, String projectSpec, Date startDate, Date endDate,
String ccmAddr )
throws ScmException
{
@@ -286,7 +288,7 @@ public class SynergyUtil
logger.debug( "Synergy : Entering create method" );
}
- List files = new ArrayList();
+ List<File> files = new ArrayList<File>();
files.add( file );
Commandline cl = SynergyCCM.create( files, message, ccmAddr );
@@ -401,7 +403,7 @@ public class SynergyUtil
logger.debug( "Synergy : Entering delete method" );
}
- List list = new ArrayList();
+ List<File> list = new ArrayList<File>();
list.add( file );
Commandline cl = SynergyCCM.delete( list, ccmAddr, replace );
@@ -512,7 +514,7 @@ public class SynergyUtil
* @param ccmAddr Synergy session ID.
* @throws ScmException
*/
- public static void checkoutFiles( ScmLogger logger, List files, String ccmAddr )
+ public static void checkoutFiles( ScmLogger logger, List<File> files, String ccmAddr )
throws ScmException
{
if ( logger.isDebugEnabled() )
@@ -591,7 +593,7 @@ public class SynergyUtil
* @return checkout directory (directory + new project spec)
* @throws ScmException
*/
- public static void checkinFiles( ScmLogger logger, List files, String comment, String ccmAddr )
+ public static void checkinFiles( ScmLogger logger, List<File> files, String comment, String ccmAddr )
throws ScmException
{
if ( logger.isDebugEnabled() )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsChangeLogCommand.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/TfsChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -23,7 +23,9 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
+import java.util.List;
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -34,6 +36,10 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.provider.tfs.command.consumer.ErrorStreamConsumer;
import org.apache.maven.scm.provider.tfs.command.consumer.TfsChangeLogConsumer;
+/**
+ * @author Olivier Lamy
+ * @version $id$
+ */
public class TfsChangeLogCommand
extends AbstractChangeLogCommand
{
@@ -42,11 +48,11 @@ public class TfsChangeLogCommand
Date endDate, ScmBranch branch, String datePattern )
throws ScmException
{
- ArrayList changeLogs = new ArrayList();
- Iterator iter = f.getFileList().iterator();
+ List<ChangeSet> changeLogs = new ArrayList<ChangeSet>();
+ Iterator<File> iter = f.getFileList().iterator();
if ( !iter.hasNext() )
{
- ArrayList dir = new ArrayList();
+ List<File> dir = new ArrayList<File>();
// No files to iterate
dir.add( f.getBasedir() );
iter = dir.iterator();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/TfsChangeLogConsumer.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/TfsChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/TfsChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/TfsChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -34,6 +34,10 @@ import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.util.AbstractConsumer;
+/**
+ * @author Olivier Lamy
+ * @version $Id$
+ */
public class TfsChangeLogConsumer
extends AbstractConsumer
{
@@ -44,9 +48,9 @@ public class TfsChangeLogConsumer
private static final String PATTERN_ITEM = "\n ([^$]+) (\\$/.*)";
- ArrayList logs = new ArrayList();
+ private List<ChangeSet> logs = new ArrayList<ChangeSet>();
- String buffer = "";
+ private String buffer = "";
boolean fed = false;
@@ -65,7 +69,7 @@ public class TfsChangeLogConsumer
buffer += line + "\n";
}
- public List getLogs()
+ public List<ChangeSet> getLogs()
{
addChangeLog();
return logs;
@@ -85,7 +89,7 @@ public class TfsChangeLogConsumer
String comment = m.group( 4 ).trim();
Pattern itemPattern = Pattern.compile( PATTERN_ITEM );
Matcher itemMatcher = itemPattern.matcher( m.group( 5 ) );
- List files = new ArrayList();
+ List<ChangeFile> files = new ArrayList<ChangeFile>();
while ( itemMatcher.find() )
{
ChangeFile file = new ChangeFile( itemMatcher.group( 2 ).trim(), revision );
@@ -114,6 +118,7 @@ public class TfsChangeLogConsumer
return fed;
}
+ @SuppressWarnings( "deprecation" )
protected static Date parseDate( String dateString )
throws ParseException
{
@@ -176,7 +181,7 @@ public class TfsChangeLogConsumer
timeZone = TimeZone.getDefault();
}
- List formats = new ArrayList();
+ List<DateFormat> formats = new ArrayList<DateFormat>();
for ( int dateStyle = DateFormat.FULL; dateStyle <= DateFormat.SHORT; dateStyle++ )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.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/changelog/VssChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -35,6 +35,7 @@ import java.util.Vector;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class VssChangeLogConsumer
@@ -106,7 +107,7 @@ public class VssChangeLogConsumer
/**
* rcs entries, in reverse (date, time, author, comment) order
*/
- private Map entries = new TreeMap( Collections.reverseOrder() );
+ private Map<String, ChangeSet> entries = new TreeMap<String, ChangeSet>( Collections.reverseOrder() );
private ChangeFile currentFile;
@@ -128,9 +129,9 @@ public class VssChangeLogConsumer
this.repo = repo;
}
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
- return new ArrayList( entries.values() );
+ return new ArrayList<ChangeSet>( entries.values() );
}
/** {@inheritDoc} */
@@ -187,7 +188,7 @@ public class VssChangeLogConsumer
private void processGetAuthor( String line )
{
String[] result = line.split( "\\s" );
- Vector vector = new Vector();
+ Vector<String> vector = new Vector<String>();
for ( int i = 0; i < result.length; i++ )
{
if ( !result[i].equals( "" ) )
@@ -195,7 +196,7 @@ public class VssChangeLogConsumer
vector.add( result[i] );
}
}
- currentChangeSet.setAuthor( (String) vector.get( 1 ) );
+ currentChangeSet.setAuthor( vector.get( 1 ) );
currentChangeSet.setDate(
parseDate( vector.get( 3 ) + " " + vector.get( 5 ), userDatePattern, "dd.MM.yy HH:mm" ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.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/changelog/VssHistoryCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java Sun Jan 2 14:05:25 2011
@@ -38,7 +38,8 @@ import java.util.Locale;
/**
* @author <a href="mailto:triek@thrx.de">Thorsten Riek</a>
- * @version $Id: VssHistoryCommand.java 02.06.2006 00:05:29
+ * @author Olivier Lamy
+ * @version $Id$
*/
public class VssHistoryCommand
extends AbstractChangeLogCommand
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/changelog/CvsChangeLogConsumer.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/changelog/CvsChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&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/changelog/CvsChangeLogConsumer.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/changelog/CvsChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -34,12 +34,13 @@ import java.util.StringTokenizer;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class CvsChangeLogConsumer
extends AbstractConsumer
{
- private List entries = new ArrayList();
+ private List<ChangeSet> entries = new ArrayList<ChangeSet>();
// state machine constants for reading cvs output
@@ -113,20 +114,18 @@ public class CvsChangeLogConsumer
this.userDatePattern = userDatePattern;
}
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
- Collections.sort( entries, new Comparator()
+ Collections.sort( entries, new Comparator<ChangeSet>()
{
- public int compare( Object entry1, Object entry2 )
+ public int compare( ChangeSet set1, ChangeSet set2 )
{
- ChangeSet set1 = (ChangeSet) entry1;
- ChangeSet set2 = (ChangeSet) entry2;
return set1.getDate().compareTo( set2.getDate() );
}
} );
- List fixedModifications = new ArrayList();
+ List<ChangeSet> fixedModifications = new ArrayList<ChangeSet>();
ChangeSet currentEntry = null;
- for ( Iterator entryIterator = entries.iterator(); entryIterator.hasNext(); )
+ for ( Iterator<ChangeSet> entryIterator = entries.iterator(); entryIterator.hasNext(); )
{
ChangeSet entry = (ChangeSet) entryIterator.next();
if ( currentEntry == null )
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/changelog/GitChangeLogCommand.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/changelog/GitChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&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/changelog/GitChangeLogCommand.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/changelog/GitChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -41,6 +41,7 @@ import java.util.TimeZone;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class GitChangeLogCommand
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/changelog/GitChangeLogConsumer.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/changelog/GitChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&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/changelog/GitChangeLogConsumer.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/changelog/GitChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Locale;
import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.git.GitChangeSet;
import org.apache.maven.scm.util.AbstractConsumer;
@@ -33,6 +34,7 @@ import org.apache.regexp.RESyntaxExcepti
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class GitChangeLogConsumer
@@ -97,7 +99,7 @@ public class GitChangeLogConsumer
/**
* List of change log entries
*/
- private List entries = new ArrayList();
+ private List<ChangeSet> entries = new ArrayList<ChangeSet>();
/**
* The current log entry being processed by the parser
@@ -160,7 +162,7 @@ public class GitChangeLogConsumer
}
}
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
// this is needed since the processFile does not always get a the end-sequence correctly.
processGetFile( "" );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java Sun Jan 2 14:05:25 2011
@@ -44,6 +44,7 @@ import java.util.TimeZone;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SvnChangeLogCommand
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java?rev=1054408&r1=1054407&r2=1054408&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java Sun Jan 2 14:05:25 2011
@@ -24,6 +24,7 @@ import java.util.Date;
import java.util.List;
import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.svn.SvnChangeSet;
import org.apache.maven.scm.util.AbstractConsumer;
@@ -85,7 +86,7 @@ public class SvnChangeLogConsumer
/**
* List of change log entries
*/
- private List entries = new ArrayList();
+ private List<ChangeSet> entries = new ArrayList<ChangeSet>();
/**
* The current log entry being processed by the parser
@@ -133,7 +134,7 @@ public class SvnChangeLogConsumer
this.userDateFormat = userDateFormat;
}
- public List getModifications()
+ public List<ChangeSet> getModifications()
{
return entries;
}