From f4367f2684f3642bf3e4e1ea895c7cd43946d6ea Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 14 Sep 2011 11:58:58 +0200
Subject: [PATCH] added revision to BlameLine

---
 .../repository/AbstractRepositoryHandler.java |  1 +
 .../java/sonia/scm/repository/BlameLine.java  | 36 ++++++++++++++++---
 .../scm/repository/BlamePagingResult.java     |  4 +--
 .../sonia/scm/repository/BlameViewer.java     |  4 +--
 .../sonia/scm/repository/BlameViewerUtil.java |  5 ++-
 .../scm/repository/RepositoryHandler.java     |  1 +
 .../scm/repository/RepositoryManager.java     |  1 +
 .../sonia/scm/repository/GitBlameViewer.java  |  7 ++--
 .../sonia/scm/repository/SvnBlameViewer.java  |  4 ++-
 .../scm/api/rest/PlainBlameProvider.java      |  6 ++--
 10 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
index cbc64b3f97..e6d4d39f5f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -193,6 +193,7 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
    * @param repository
    *
    * @return
+   * @since 1.8
    */
   @Override
   public BlameViewer getBlameViewer(Repository repository)
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 dd34e3daf1..9ee05af36b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
@@ -40,9 +40,8 @@ import java.util.Date;
 /**
  * Class description
  *
- *
- * @version        Enter version here..., 11/09/14
- * @author         Enter your name here...
+ * @author Sebastian Sdorra
+ * @since 1.8
  */
 public class BlameLine
 {
@@ -60,15 +59,17 @@ public class BlameLine
    * @param emailAddress
    * @param name
    * @param when
+   * @param revision
    * @param code
    * @param lineNumber
    */
-  public BlameLine(String emailAddress, String name, Date when, String code,
-                   int lineNumber)
+  public BlameLine(String emailAddress, String name, Date when,
+                   String revision, String code, int lineNumber)
   {
     this.emailAddress = emailAddress;
     this.name = name;
     this.when = when;
+    this.revision = revision;
     this.code = code;
     this.lineNumber = lineNumber;
   }
@@ -119,6 +120,17 @@ public class BlameLine
     return name;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getRevision()
+  {
+    return revision;
+  }
+
   /**
    * Method description
    *
@@ -176,6 +188,17 @@ public class BlameLine
     this.name = name;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param revision
+   */
+  public void setRevision(String revision)
+  {
+    this.revision = revision;
+  }
+
   /**
    * Method description
    *
@@ -201,6 +224,9 @@ public class BlameLine
   /** Field description */
   private String name;
 
+  /** Field description */
+  private String revision;
+
   /** Field description */
   private Date when;
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/BlamePagingResult.java b/scm-core/src/main/java/sonia/scm/repository/BlamePagingResult.java
index d63456316d..3d99b0b550 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlamePagingResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlamePagingResult.java
@@ -47,8 +47,8 @@ import javax.xml.bind.annotation.XmlRootElement;
  * Class description
  *
  *
- * @version        Enter version here..., 11/09/14
- * @author         Enter your name here...    
+ * @author Sebastian Sdorra
+ * @since 1.8
  */
 @XmlRootElement(name = "blame-paging")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/scm-core/src/main/java/sonia/scm/repository/BlameViewer.java b/scm-core/src/main/java/sonia/scm/repository/BlameViewer.java
index 54deb7261b..411ddb4b10 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameViewer.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameViewer.java
@@ -37,8 +37,8 @@ package sonia.scm.repository;
  * Interface description
  *
  *
- * @version        Enter version here..., 11/09/14
- * @author         Enter your name here...
+ * @author Sebastian Sdorra
+ * @since 1.8
  */
 public interface BlameViewer
 {
diff --git a/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java b/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java
index 1bbd12786c..ed3d19f1fd 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameViewerUtil.java
@@ -49,9 +49,8 @@ import sonia.scm.util.AssertUtil;
 /**
  * Class description
  *
- *
- * @version        Enter version here..., 11/09/14
- * @author         Enter your name here...    
+ * @author Sebastian Sdorra
+ * @since 1.8
  */
 @Singleton
 public class BlameViewerUtil extends CacheClearHook
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
index 69cc7db03e..2855338442 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
@@ -43,6 +43,7 @@ import sonia.scm.plugin.ExtensionPoint;
 /**
  *
  * @author Sebastian Sdorra
+ * @since 1.8
  */
 @ExtensionPoint
 public interface RepositoryHandler
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
index 0d5028a523..90aba18a2f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
@@ -73,6 +73,7 @@ public interface RepositoryManager
    * @return null if BlameViewer is not supported
    *
    * @throws RepositoryException
+   * @since 1.8
    */
   public BlameViewer getBlameViewer(Repository repository)
           throws RepositoryException;
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 e8da37d9fe..766d59787a 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
@@ -57,8 +57,7 @@ import java.util.List;
  * Class description
  *
  *
- * @version        Enter version here..., 11/09/14
- * @author         Enter your name here...
+ * @author Sebastian Sdorra
  */
 public class GitBlameViewer implements BlameViewer
 {
@@ -130,6 +129,10 @@ public class GitBlameViewer implements BlameViewer
         blameLine.setEmailAddress(author.getEmailAddress());
         blameLine.setWhen(author.getWhen());
 
+        String rev = blameResult.getSourceCommit(i).getId().getName();
+
+        blameLine.setRevision(rev);
+
         String content = blameResult.getResultContents().getString(i);
 
         blameLine.setCode(content);
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameViewer.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameViewer.java
index ef0ef9d28a..6eed9cceef 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameViewer.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameViewer.java
@@ -131,7 +131,9 @@ public class SvnBlameViewer implements BlameViewer
                                String mergedPath, int lineNumber)
                 throws SVNException
         {
-          blameLines.add(new BlameLine(null, author, date, line, lineNumber));
+          blameLines.add(new BlameLine(null, author, date,
+                                       String.valueOf(revision), line,
+                                       lineNumber));
         }
         @Override
         public boolean handleRevision(Date date, long revision, String author,
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java b/scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java
index a13ffd963f..e5ecbbee6a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/PlainBlameProvider.java
@@ -118,11 +118,11 @@ public class PlainBlameProvider
 
     for (BlameLine line : bpr.getBlameLines())
     {
-      String name = line.getName();
+      String revision = line.getRevision();
 
-      if (Util.isNotEmpty(name))
+      if (Util.isNotEmpty(revision))
       {
-        writer.append(name).append("  ");
+        writer.append(revision).append("  ");
       }
 
       writer.println(line.getCode());