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/03 22:16:01 UTC
svn commit: r1054754 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/
maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/
maven-scm-providers/maven-scm-prov...
Author: olamy
Date: Mon Jan 3 21:15:57 2011
New Revision: 1054754
URL: http://svn.apache.org/viewvc?rev=1054754&view=rev
Log:
[SCM-591] move to Java 1.5 : diff command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.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/diff/CvsDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.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/diff/SvnDiffCommand.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java?rev=1054754&r1=1054753&r2=1054754&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java Mon Jan 3 21:15:57 2011
@@ -19,11 +19,12 @@ package org.apache.maven.scm.command.dif
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
import java.util.Map;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
@@ -31,13 +32,15 @@ import java.util.Map;
public class DiffScmResult
extends ScmResult
{
- private List changedFiles;
+ private static final long serialVersionUID = 4036970486972633082L;
+
+ private List<ScmFile> changedFiles;
- private Map differences;
+ private Map<String,StringBuilder> differences;
private String patch;
- public DiffScmResult( String commandLine, List changedFiles, Map differences, String patch )
+ public DiffScmResult( String commandLine, List<ScmFile> changedFiles, Map<String,StringBuilder> differences, String patch )
{
this( commandLine, null, null, true );
this.changedFiles = changedFiles;
@@ -50,7 +53,7 @@ public class DiffScmResult
super( commandLine, providerMessage, commandOutput, success );
}
- public DiffScmResult( List changedFiles, Map differences, String patch, ScmResult result )
+ public DiffScmResult( List<ScmFile> changedFiles, Map<String,StringBuilder> differences, String patch, ScmResult result )
{
super( result );
@@ -61,12 +64,12 @@ public class DiffScmResult
this.patch = patch;
}
- public List getChangedFiles()
+ public List<ScmFile> getChangedFiles()
{
return changedFiles;
}
- public Map getDifferences()
+ public Map<String,StringBuilder> getDifferences()
{
return differences;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.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/diff/BazaarDiffConsumer.java?rev=1054754&r1=1054753&r2=1054754&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java Mon Jan 3 21:15:57 2011
@@ -64,11 +64,11 @@ public class BazaarDiffConsumer
private String currentFile;
- private StringBuffer currentDifference;
+ private StringBuilder currentDifference;
- private List changedFiles = new ArrayList();
+ private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map differences = new HashMap();
+ private Map<String,StringBuilder> differences = new HashMap<String,StringBuilder>();
private StringBuffer patch = new StringBuffer();
@@ -168,7 +168,7 @@ public class BazaarDiffConsumer
if ( tmpFile.isFile() )
{
currentFile = tmpLine;
- currentDifference = new StringBuffer();
+ currentDifference = new StringBuilder();
differences.put( currentFile, currentDifference );
changedFiles.add( new ScmFile( tmpLine, status ) );
return true;
@@ -177,12 +177,12 @@ public class BazaarDiffConsumer
return false;
}
- public List getChangedFiles()
+ public List<ScmFile> getChangedFiles()
{
return changedFiles;
}
- public Map getDifferences()
+ public Map<String,StringBuilder> getDifferences()
{
return differences;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.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/diff/HgDiffConsumer.java?rev=1054754&r1=1054753&r2=1054754&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java Mon Jan 3 21:15:57 2011
@@ -32,6 +32,7 @@ import java.util.Map;
/**
* @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class HgDiffConsumer
@@ -64,14 +65,15 @@ public class HgDiffConsumer
private String currentFile;
- private StringBuffer currentDifference;
+ private StringBuilder currentDifference;
- private List changedFiles = new ArrayList();
+ private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map differences = new HashMap();
+ private Map<String,StringBuilder> differences = new HashMap<String,StringBuilder>();
private StringBuffer patch = new StringBuffer();
+ @SuppressWarnings( "unused" )
private File workingDirectory;
@@ -96,7 +98,7 @@ public class HgDiffConsumer
changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
- currentDifference = new StringBuffer();
+ currentDifference = new StringBuilder();
differences.put( currentFile, currentDifference );
@@ -153,12 +155,12 @@ public class HgDiffConsumer
}
}
- public List getChangedFiles()
+ public List<ScmFile> getChangedFiles()
{
return changedFiles;
}
- public Map getDifferences()
+ public Map<String,StringBuilder> getDifferences()
{
return differences;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.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/diff/StarteamDiffCommand.java?rev=1054754&r1=1054753&r2=1054754&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java Mon Jan 3 21:15:57 2011
@@ -57,7 +57,7 @@ public class StarteamDiffCommand
getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
}
- if ( fileSet.getFiles().length != 0 )
+ if ( fileSet.getFileList().isEmpty() )
{
throw new ScmException( "This provider doesn't support diff command on a subsets of a directory" );
}
@@ -90,7 +90,7 @@ public class StarteamDiffCommand
throws ScmException
{
- List args = new ArrayList();
+ List<String> args = new ArrayList<String>();
args.add( "-filter" );
args.add( "M" );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.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/diff/StarteamDiffConsumer.java?rev=1054754&r1=1054753&r2=1054754&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java Mon Jan 3 21:15:57 2011
@@ -19,17 +19,17 @@ package org.apache.maven.scm.provider.st
* under the License.
*/
-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.HashMap;
import java.util.List;
import java.util.Map;
+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;
+
/**
* @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
* @version $Id$
@@ -53,6 +53,7 @@ public class StarteamDiffConsumer
private ScmLogger logger;
+ @SuppressWarnings( "unused" )
private String currentDir = "";
private boolean diffBlockProcessingStarted = false;
@@ -61,11 +62,11 @@ public class StarteamDiffConsumer
private String currentFile;
- private StringBuffer currentDifference;
+ private StringBuilder currentDifference;
- private List changedFiles = new ArrayList();
+ private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map differences = new HashMap();
+ private Map<String,StringBuilder> differences = new HashMap<String,StringBuilder>();
private StringBuffer patch = new StringBuffer();
@@ -194,17 +195,17 @@ public class StarteamDiffConsumer
changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
- currentDifference = new StringBuffer();
+ currentDifference = new StringBuilder();
differences.put( currentFile, currentDifference );
}
- public List getChangedFiles()
+ public List<ScmFile> getChangedFiles()
{
return changedFiles;
}
- public Map getDifferences()
+ public Map<String,StringBuilder> getDifferences()
{
return differences;
}
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/diff/CvsDiffConsumer.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/diff/CvsDiffConsumer.java?rev=1054754&r1=1054753&r2=1054754&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/diff/CvsDiffConsumer.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/diff/CvsDiffConsumer.java Mon Jan 3 21:15:57 2011
@@ -32,6 +32,7 @@ import java.util.Map;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @author Olivier Lamy
* @version $Id$
* @todo share with SVN (3 extra lines can be ignored)
*/
@@ -77,11 +78,11 @@ public class CvsDiffConsumer
private String currentFile;
- private StringBuffer currentDifference;
+ private StringBuilder currentDifference;
- private List changedFiles = new ArrayList();
+ private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map differences = new HashMap();
+ private Map<String,StringBuilder> differences = new HashMap<String,StringBuilder>();
private StringBuffer patch = new StringBuffer();
@@ -113,7 +114,7 @@ public class CvsDiffConsumer
changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
- currentDifference = new StringBuffer();
+ currentDifference = new StringBuilder();
differences.put( currentFile, currentDifference );
@@ -180,12 +181,12 @@ public class CvsDiffConsumer
}
}
- public List getChangedFiles()
+ public List<ScmFile> getChangedFiles()
{
return changedFiles;
}
- public Map getDifferences()
+ public Map<String,StringBuilder> getDifferences()
{
return differences;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java?rev=1054754&r1=1054753&r2=1054754&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java Mon Jan 3 21:15:57 2011
@@ -35,6 +35,7 @@ import java.util.Map;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class GitDiffConsumer
@@ -81,11 +82,11 @@ public class GitDiffConsumer
private String currentFile;
- private StringBuffer currentDifference;
+ private StringBuilder currentDifference;
- private List changedFiles = new ArrayList();
+ private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map differences = new HashMap();
+ private Map<String,StringBuilder> differences = new HashMap<String,StringBuilder>();
private StringBuffer patch = new StringBuffer();
@@ -128,7 +129,7 @@ public class GitDiffConsumer
changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
- currentDifference = new StringBuffer();
+ currentDifference = new StringBuilder();
differences.put( currentFile, currentDifference );
@@ -189,12 +190,12 @@ public class GitDiffConsumer
}
}
- public List getChangedFiles()
+ public List<ScmFile> getChangedFiles()
{
return changedFiles;
}
- public Map getDifferences()
+ public Map<String,StringBuilder> getDifferences()
{
return differences;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java?rev=1054754&r1=1054753&r2=1054754&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java Mon Jan 3 21:15:57 2011
@@ -32,6 +32,7 @@ import java.util.Map;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SvnDiffConsumer
@@ -66,11 +67,11 @@ public class SvnDiffConsumer
private String currentFile;
- private StringBuffer currentDifference;
+ private StringBuilder currentDifference;
- private List changedFiles = new ArrayList();
+ private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map differences = new HashMap();
+ private Map<String,StringBuilder> differences = new HashMap<String,StringBuilder>();
private StringBuffer patch = new StringBuffer();
@@ -97,7 +98,7 @@ public class SvnDiffConsumer
changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
- currentDifference = new StringBuffer();
+ currentDifference = new StringBuilder();
differences.put( currentFile, currentDifference );
@@ -154,12 +155,12 @@ public class SvnDiffConsumer
}
}
- public List getChangedFiles()
+ public List<ScmFile> getChangedFiles()
{
return changedFiles;
}
- public Map getDifferences()
+ public Map<String,StringBuilder> getDifferences()
{
return differences;
}
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/diff/SvnDiffCommand.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/diff/SvnDiffCommand.java?rev=1054754&r1=1054753&r2=1054754&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/diff/SvnDiffCommand.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/diff/SvnDiffCommand.java Mon Jan 3 21:15:57 2011
@@ -38,6 +38,7 @@ import java.io.File;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class SvnDiffCommand