From b903efee62d3b0951afc7e9b74bf1c1f061d61f2 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 22 Sep 2011 15:49:28 +0200
Subject: [PATCH] improve blame api and description to blameline

---
 .../java/sonia/scm/repository/BlameLine.java  | 39 ++++++++++++++++---
 .../sonia/scm/repository/GitBlameViewer.java  |  3 ++
 .../sonia/scm/repository/HgBlameViewer.java   |  3 +-
 .../sonia/scm/repository/SvnBlameHandler.java |  4 +-
 4 files changed, 40 insertions(+), 9 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 cae2eb9e36..351a11fe87 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
@@ -56,17 +56,19 @@ public class BlameLine
    * @param author
    * @param when
    * @param revision
+   * @param description
    * @param code
    * @param lineNumber
    */
-  public BlameLine(Person author, Long when, String revision, String code,
-                   int lineNumber)
+  public BlameLine(int lineNumber, String revision, Long when, Person author,
+                   String description, String code)
   {
-    this.author = author;
-    this.when = when;
-    this.revision = revision;
-    this.code = code;
     this.lineNumber = lineNumber;
+    this.revision = revision;
+    this.when = when;
+    this.author = author;
+    this.description = description;
+    this.code = code;
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -93,6 +95,17 @@ public class BlameLine
     return code;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
   /**
    * Method description
    *
@@ -150,6 +163,17 @@ public class BlameLine
     this.code = code;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param description
+   */
+  public void setDescription(String description)
+  {
+    this.description = description;
+  }
+
   /**
    * Method description
    *
@@ -191,6 +215,9 @@ public class BlameLine
   /** Field description */
   private String code;
 
+  /** Field description */
+  private String description;
+
   /** Field description */
   private int lineNumber;
 
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 02eb8a31ed..1d7f01c227 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
@@ -133,6 +133,9 @@ public class GitBlameViewer implements BlameViewer
                                        author.getEmailAddress()));
 
         RevCommit commit = gitBlameResult.getSourceCommit(i);
+
+        blameLine.setDescription(commit.getShortMessage());
+
         long when = GitUtil.getCommitTime(commit);
 
         blameLine.setWhen(when);
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java
index 22b92a5429..9ddf4232db 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java
@@ -216,7 +216,8 @@ public class HgBlameViewer implements BlameViewer
       // todo parse date
       Long when = getDate(m.group(3));
 
-      blameLine = new BlameLine(authorPerson, when, m.group(2), m.group(5), nr);
+      blameLine = new BlameLine(nr, m.group(2), when, authorPerson, null,
+                                m.group(5));
     }
     else if (logger.isWarnEnabled())
     {
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 0e3e1bbce3..4cfe8467ec 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
@@ -132,8 +132,8 @@ public class SvnBlameHandler implements ISVNAnnotateHandler
       when = date.getTime();
     }
 
-    blameLines.add(new BlameLine(authorPerson, when, String.valueOf(revision),
-                                 line, lineNumber + 1));
+    blameLines.add(new BlameLine(lineNumber + 1, String.valueOf(revision),
+                                 when, authorPerson, null, line));
   }
 
   /**