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 10:01:54 UTC
svn commit: r1054366 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/
maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/
maven-scm-providers/maven-scm-pr...
Author: olamy
Date: Sun Jan 2 09:01:53 2011
New Revision: 1054366
URL: http://svn.apache.org/viewvc?rev=1054366&view=rev
Log:
[SCM-591] move to Java 1.5 : blame command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.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/blame/CvsBlameConsumer.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/blame/GitBlameCommand.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/blame/GitBlameConsumer.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/blame/SvnBlameCommand.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/blame/SvnBlameConsumer.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java Sun Jan 2 09:01:53 2011
@@ -29,6 +29,9 @@ import java.util.Date;
public class BlameLine
implements Serializable
{
+
+ private static final long serialVersionUID = 2675122069344705612L;
+
private Date date;
private String revision;
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java Sun Jan 2 09:01:53 2011
@@ -19,20 +19,22 @@ package org.apache.maven.scm.command.bla
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class BlameScmResult
extends ScmResult
{
- private List lines;
+ private static final long serialVersionUID = -3877526036464636595L;
+ private List<BlameLine> lines;
- public BlameScmResult( String commandLine, List /* BlameLine */ lines )
+ public BlameScmResult( String commandLine, List<BlameLine> lines )
{
this( commandLine, null, null, true );
@@ -44,14 +46,14 @@ public class BlameScmResult
super( commandLine, providerMessage, commandOutput, success );
}
- public BlameScmResult( List /* BlameLine */ lines, ScmResult scmResult )
+ public BlameScmResult( List<BlameLine> lines, ScmResult scmResult )
{
super( scmResult );
this.lines = lines;
}
- public List /* BlameLine */ getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameCommand.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/blame/BazaarBlameCommand.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameCommand.java Sun Jan 2 09:01:53 2011
@@ -29,6 +29,7 @@ import org.apache.maven.scm.provider.baz
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class BazaarBlameCommand
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameConsumer.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/blame/BazaarBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -30,6 +30,7 @@ import java.util.List;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class BazaarBlameConsumer
@@ -37,7 +38,7 @@ public class BazaarBlameConsumer
{
private static final String BAZAAR_TIMESTAMP_PATTERN = "yyyyMMdd";
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public BazaarBlameConsumer( ScmLogger logger )
{
@@ -62,7 +63,7 @@ public class BazaarBlameConsumer
lines.add( new BlameLine( date, revision, author ) );
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.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/blame/ClearCaseBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -30,6 +30,7 @@ import java.util.List;
/**
* @author Jérémie Lagarde
+ * @author Olivier Lamy
* @since 1.4
*/
public class ClearCaseBlameConsumer
@@ -42,7 +43,7 @@ public class ClearCaseBlameConsumer
private RE lineRegexp;
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public ClearCaseBlameConsumer( ScmLogger logger )
{
@@ -68,7 +69,7 @@ public class ClearCaseBlameConsumer
}
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.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/blame/HgBlameCommand.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.java Sun Jan 2 09:01:53 2011
@@ -29,6 +29,7 @@ import org.apache.maven.scm.provider.hg.
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class HgBlameCommand
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.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/blame/HgBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -30,12 +30,13 @@ import java.util.List;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class HgBlameConsumer
extends HgConsumer
{
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
private static final String HG_TIMESTAMP_PATTERN = "EEE MMM dd HH:mm:ss yyyy Z";
@@ -62,7 +63,7 @@ public class HgBlameConsumer
lines.add( new BlameLine( dateTime, revision, author ) );
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameCommand.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/blame/PerforceBlameCommand.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameCommand.java Sun Jan 2 09:01:53 2011
@@ -37,6 +37,7 @@ import java.util.List;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class PerforceBlameCommand
@@ -91,10 +92,10 @@ public class PerforceBlameCommand
// Combine results
- List lines = blameConsumer.getLines();
+ List<BlameLine> lines = blameConsumer.getLines();
for ( int i = 0; i < lines.size(); i++ )
{
- BlameLine line = (BlameLine) lines.get( i );
+ BlameLine line = lines.get( i );
String revision = line.getRevision();
line.setAuthor( filelogConsumer.getAuthor( revision ) );
line.setDate( filelogConsumer.getDate( revision ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameConsumer.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/blame/PerforceBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -29,6 +29,7 @@ import java.util.List;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class PerforceBlameConsumer
@@ -43,7 +44,7 @@ public class PerforceBlameConsumer
*/
private RE lineRegexp;
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public PerforceBlameConsumer( ScmLogger logger )
{
@@ -62,7 +63,7 @@ public class PerforceBlameConsumer
}
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameCommand.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/blame/TfsBlameCommand.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameCommand.java Sun Jan 2 09:01:53 2011
@@ -32,6 +32,7 @@ import java.io.File;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class TfsBlameCommand
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.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/blame/TfsBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -47,7 +47,7 @@ public class TfsBlameConsumer
*/
private RE lineRegexp;
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public TfsBlameConsumer( ScmLogger logger )
{
@@ -69,7 +69,7 @@ public class TfsBlameConsumer
}
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
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/blame/CvsBlameConsumer.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/blame/CvsBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&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/blame/CvsBlameConsumer.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/blame/CvsBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -31,6 +31,7 @@ import org.apache.regexp.RE;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class CvsBlameConsumer
@@ -47,7 +48,7 @@ public class CvsBlameConsumer
*/
private RE lineRegexp;
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public CvsBlameConsumer( ScmLogger logger )
{
@@ -68,7 +69,7 @@ public class CvsBlameConsumer
String dateTimeStr = lineRegexp.getParen( 3 ).trim();
Date dateTime = parseDate( dateTimeStr, null, CVS_TIMESTAMP_PATTERN, Locale.US );
- getLines().add( new BlameLine( dateTime, revision, author ) );
+ lines.add( new BlameLine( dateTime, revision, author ) );
if ( getLogger().isDebugEnabled() )
{
@@ -78,7 +79,7 @@ public class CvsBlameConsumer
}
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
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/blame/GitBlameCommand.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/blame/GitBlameCommand.java?rev=1054366&r1=1054365&r2=1054366&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/blame/GitBlameCommand.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/blame/GitBlameCommand.java Sun Jan 2 09:01:53 2011
@@ -33,6 +33,7 @@ import java.io.File;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class GitBlameCommand
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/blame/GitBlameConsumer.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/blame/GitBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&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/blame/GitBlameConsumer.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/blame/GitBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -29,6 +29,7 @@ import java.util.List;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class GitBlameConsumer
@@ -36,7 +37,7 @@ public class GitBlameConsumer
{
private static final String GIT_TIMESTAMP_PATTERN = "yyyy-MM-dd HH:mm:ss Z";
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public GitBlameConsumer( ScmLogger logger )
{
@@ -59,7 +60,7 @@ public class GitBlameConsumer
}
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}
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/blame/SvnBlameCommand.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/blame/SvnBlameCommand.java?rev=1054366&r1=1054365&r2=1054366&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/blame/SvnBlameCommand.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/blame/SvnBlameCommand.java Sun Jan 2 09:01:53 2011
@@ -35,6 +35,7 @@ import java.io.File;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class SvnBlameCommand
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/blame/SvnBlameConsumer.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/blame/SvnBlameConsumer.java?rev=1054366&r1=1054365&r2=1054366&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/blame/SvnBlameConsumer.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/blame/SvnBlameConsumer.java Sun Jan 2 09:01:53 2011
@@ -34,6 +34,7 @@ import java.util.TimeZone;
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class SvnBlameConsumer
@@ -71,7 +72,7 @@ public class SvnBlameConsumer
private SimpleDateFormat dateFormat;
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public SvnBlameConsumer( ScmLogger logger )
{
@@ -121,7 +122,7 @@ public class SvnBlameConsumer
String date = dateRegexp.getParen( 1 );
String time = dateRegexp.getParen( 2 );
Date dateTime = parseDateTime( date + " " + time );
- getLines().add( new BlameLine( dateTime, revision, author ) );
+ lines.add( new BlameLine( dateTime, revision, author ) );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Author of line " + lineNumber + ": " + author + " (" + date + ")" );
@@ -142,7 +143,7 @@ public class SvnBlameConsumer
}
}
- public List getLines()
+ public List<BlameLine> getLines()
{
return lines;
}