Author: olamy
Date: Sun Jan 9 17:24:53 2011
New Revision: 1056981
URL: http://svn.apache.org/viewvc?rev=1056981&view=rev
Log:
[SCM-591] Move to Java 1.5 : in diff result use CharSequence rather than a
direct implementation
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-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
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=1056981&r1=1056980&r2=1056981&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
Sun Jan 9 17:24:53 2011
@@ -36,11 +36,11 @@ public class DiffScmResult
private List<ScmFile> changedFiles;
- private Map<String,StringBuilder> differences;
+ private Map<String,CharSequence> differences;
private String patch;
- public DiffScmResult( String commandLine, List<ScmFile> changedFiles,
Map<String,StringBuilder> differences, String patch )
+ public DiffScmResult( String commandLine, List<ScmFile> changedFiles,
Map<String,CharSequence> differences, String patch )
{
this( commandLine, null, null, true );
this.changedFiles = changedFiles;
@@ -53,7 +53,7 @@ public class DiffScmResult
super( commandLine, providerMessage, commandOutput, success );
}
- public DiffScmResult( List<ScmFile> changedFiles,
Map<String,StringBuilder> differences, String patch, ScmResult result )
+ public DiffScmResult( List<ScmFile> changedFiles, Map<String,CharSequence>
differences, String patch, ScmResult result )
{
super( result );
@@ -69,7 +69,7 @@ public class DiffScmResult
return changedFiles;
}
- public Map<String,StringBuilder> getDifferences()
+ public Map<String,CharSequence> 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/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=1056981&r1=1056980&r2=1056981&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
Sun Jan 9 17:24:53 2011
@@ -66,7 +66,7 @@ public class StarteamDiffConsumer
private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map<String,StringBuilder> differences = new
HashMap<String,StringBuilder>();
+ private Map<String,CharSequence> differences = new
HashMap<String,CharSequence>();
private StringBuffer patch = new StringBuffer();
@@ -205,7 +205,7 @@ public class StarteamDiffConsumer
return changedFiles;
}
- public Map<String,StringBuilder> getDifferences()
+ public Map<String,CharSequence> 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=1056981&r1=1056980&r2=1056981&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
Sun Jan 9 17:24:53 2011
@@ -82,9 +82,9 @@ public class CvsDiffConsumer
private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map<String,StringBuilder> differences = new
HashMap<String,StringBuilder>();
+ private Map<String,CharSequence> differences = new
HashMap<String,CharSequence>();
- private StringBuffer patch = new StringBuffer();
+ private StringBuilder patch = new StringBuilder();
// ----------------------------------------------------------------------
//
@@ -186,7 +186,7 @@ public class CvsDiffConsumer
return changedFiles;
}
- public Map<String,StringBuilder> getDifferences()
+ public Map<String,CharSequence> 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=1056981&r1=1056980&r2=1056981&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
Sun Jan 9 17:24:53 2011
@@ -86,9 +86,9 @@ public class GitDiffConsumer
private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map<String,StringBuilder> differences = new
HashMap<String,StringBuilder>();
+ private Map<String,CharSequence> differences = new
HashMap<String,CharSequence>();
- private StringBuffer patch = new StringBuffer();
+ private StringBuilder patch = new StringBuilder();
/**
* @see #DIFF_FILES_PATTERN
@@ -195,7 +195,7 @@ public class GitDiffConsumer
return changedFiles;
}
- public Map<String,StringBuilder> getDifferences()
+ public Map<String,CharSequence> 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=1056981&r1=1056980&r2=1056981&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
Sun Jan 9 17:24:53 2011
@@ -71,7 +71,7 @@ public class SvnDiffConsumer
private List<ScmFile> changedFiles = new ArrayList<ScmFile>();
- private Map<String,StringBuilder> differences = new
HashMap<String,StringBuilder>();
+ private Map<String,CharSequence> differences = new
HashMap<String,CharSequence>();
private StringBuffer patch = new StringBuffer();
@@ -160,7 +160,7 @@ public class SvnDiffConsumer
return changedFiles;
}
- public Map<String,StringBuilder> getDifferences()
+ public Map<String,CharSequence> getDifferences()
{
return differences;
}
