commit 165cd28fb88ebc9b5cec231c747449efd798ef65
author Michael Zhou <zhoumotongxue008@gmail.com> Wed Mar 16 23:54:32 2016 -0400
committer David Pursehouse <david.pursehouse@sonymobile.com> Thu Mar 17 05:53:13 2016 +0000
tree 001ddfc45cbbb4b87023c6b7f3d373ada01e65cc
parent 7df71029c77fde729b10d7c1a3c803b801be9aad

Unified: Fix inserting draft within a diff chunk.

The logic contained a bogus branch that I forgot to remove.

Change-Id: Id700c286e6337631cff8e3180718aaa319509649

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java
index f163495..8948b95 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java
@@ -281,14 +281,8 @@
       res = -res - 1;
       if (res > 0) {
         UnifiedDiffChunkInfo info = chunks.get(res - 1);
-        int delta = info.getCmLine() - 1 + info.getEnd() - info.getStart() - cmLine;
-        if (delta > 0) {
-          return new LineSidePair(info.getStart() + delta, info.getSide());
-        } else {
-          delta = cmLine - info.getCmLine();
-          int result = info.getStart() + delta;
-          return new LineSidePair(result, info.getSide());
-        }
+        return new LineSidePair(
+            info.getStart() + cmLine - info.getCmLine(), info.getSide());
       } else {
         // Always return side B
         return new LineSidePair(cmLine, DisplaySide.B);

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedCommentManager.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedCommentManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedCommentManager.java
index 880c8b0..134ef0f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedCommentManager.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedCommentManager.java
@@ -132,7 +132,7 @@
     for (CommentInfo info : Natives.asList(in)) {
       DisplaySide side = displaySide(info, forSide);
       if (side != null) {
-        int cmLinePlusOne = host.getCmLine(info.line() - 1, side);
+        int cmLinePlusOne = host.getCmLine(info.line() - 1, side) + 1;
         UnifiedCommentGroup group = group(side, cmLinePlusOne);
         PublishedBox box = new PublishedBox(
             group,
@@ -363,7 +363,7 @@
     if (cm.somethingSelected()) {
       // TODO: Handle range comment
     } else {
-      insertNewDraft(side, cmLine);
+      insertNewDraft(side, cmLine + 1);
     }
   }