Author: struberg
Date: Sun Feb 20 08:46:44 2011
New Revision: 1072530
URL: http://svn.apache.org/viewvc?rev=1072530&view=rev
Log:
fix code format and drop deprecated date method
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
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-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java
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=1072530&r1=1072529&r2=1072530&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 Feb 20 08:46:44 2011
@@ -54,7 +54,7 @@ public class GitBlameCommand
int exitCode = GitCommandLineUtils.execute( cl, consumer, stderr,
getLogger() );
if ( exitCode != 0 )
{
- return new BlameScmResult(cl.toString(), "The git blame command
failed.", stderr.getOutput(), false);
+ return new BlameScmResult( cl.toString(), "The git blame command
failed.", stderr.getOutput(), false );
}
return new BlameScmResult( cl.toString(), consumer.getLines() );
}
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=1072530&r1=1072529&r2=1072530&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 Feb 20 08:46:44 2011
@@ -23,6 +23,8 @@ import org.apache.maven.scm.command.blam
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.util.AbstractConsumer;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -133,7 +135,8 @@ public class GitBlameConsumer
if ( getLogger().isDebugEnabled() )
{
- getLogger().debug( author + " " + time.toGMTString() );
+ DateFormat df = SimpleDateFormat.getDateTimeInstance();
+ getLogger().debug( author + " " + df.format( time ) );
}
expectRevisionLine = true;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java?rev=1072530&r1=1072529&r2=1072530&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java
Sun Feb 20 08:46:44 2011
@@ -73,9 +73,9 @@ public class GitBlameConsumerTest
Assert.assertEquals( 3, consumer.getLines().size() );
BlameLine blameLine = (BlameLine) consumer.getLines().get( 0 );
- Assert.assertNotNull(blameLine);
+ Assert.assertNotNull( blameLine );
Assert.assertEquals( "0000000000000000000000000000000000000000",
blameLine.getRevision() );
- Assert.assertEquals("Not Committed Yet", blameLine.getAuthor());
+ Assert.assertEquals( "Not Committed Yet", blameLine.getAuthor() );
}
/**
