From 6c127b62bf44e7ece03721dd4bfaeca8509fbd35 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 15 Sep 2011 10:48:59 +0200
Subject: [PATCH] use long instead of date

---
 .../main/java/sonia/scm/repository/BlameLine.java    | 12 ++++--------
 .../java/sonia/scm/repository/GitBlameViewer.java    |  9 +++++++--
 .../java/sonia/scm/repository/SvnBlameHandler.java   |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/BlameLine.java b/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
index 591c9eac0a..cae2eb9e36 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
@@ -33,10 +33,6 @@
 
 package sonia.scm.repository;
 
-//~--- JDK imports ------------------------------------------------------------
-
-import java.util.Date;
-
 /**
  * Class description
  *
@@ -63,7 +59,7 @@ public class BlameLine
    * @param code
    * @param lineNumber
    */
-  public BlameLine(Person author, Date when, String revision, String code,
+  public BlameLine(Person author, Long when, String revision, String code,
                    int lineNumber)
   {
     this.author = author;
@@ -125,7 +121,7 @@ public class BlameLine
    *
    * @return
    */
-  public Date getWhen()
+  public Long getWhen()
   {
     return when;
   }
@@ -182,7 +178,7 @@ public class BlameLine
    *
    * @param when
    */
-  public void setWhen(Date when)
+  public void setWhen(Long when)
   {
     this.when = when;
   }
@@ -202,5 +198,5 @@ public class BlameLine
   private String revision;
 
   /** Field description */
-  private Date when;
+  private Long when;
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitBlameViewer.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitBlameViewer.java
index 571f3d74cc..51bb312045 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitBlameViewer.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitBlameViewer.java
@@ -39,6 +39,7 @@ import org.eclipse.jgit.api.BlameCommand;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.blame.BlameResult;
 import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.revwalk.RevCommit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -127,9 +128,13 @@ public class GitBlameViewer implements BlameViewer
         blameLine.setLineNumber(i);
         blameLine.setAuthor(new Person(author.getName(),
                                        author.getEmailAddress()));
-        blameLine.setWhen(author.getWhen());
 
-        String rev = blameResult.getSourceCommit(i).getId().getName();
+        RevCommit commit = blameResult.getSourceCommit(i);
+        long when = GitUtil.getCommitTime(commit);
+
+        blameLine.setWhen(when);
+
+        String rev = commit.getId().getName();
 
         blameLine.setRevision(rev);
 
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java
index 88380d6310..04d5f485d1 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java
@@ -125,8 +125,8 @@ public class SvnBlameHandler implements ISVNAnnotateHandler
       authorPerson = new Person(author);
     }
 
-    blameLines.add(new BlameLine(authorPerson, date, String.valueOf(revision),
-                                 line, lineNumber));
+    blameLines.add(new BlameLine(authorPerson, date.getTime(),
+                                 String.valueOf(revision), line, lineNumber));
   }
 
   /**