diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBox.java index 6054d2c303..182227f4bf 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBox.java @@ -16,6 +16,7 @@ package com.google.gerrit.client.diff; import com.google.gerrit.client.changes.CommentInfo; import com.google.gerrit.client.diff.PaddingManager.PaddingWidgetWrapper; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import com.google.gerrit.client.diff.SideBySide2.DiffChunkInfo; import com.google.gerrit.client.diff.SidePanel.GutterWrapper; import com.google.gwt.core.client.Scheduler; @@ -33,6 +34,11 @@ abstract class CommentBox extends Composite { private SideBySide2 parent; private DiffChunkInfo diffChunkInfo; private GutterWrapper gutterWrapper; + private DisplaySide side; + + CommentBox(DisplaySide side) { + this.side = side; + } @Override protected void onLoad() { @@ -49,8 +55,7 @@ abstract class CommentBox extends Composite { assert selfWidgetWrapper != null; selfWidgetWrapper.getWidget().changed(); if (diffChunkInfo != null) { - parent.resizePaddingOnOtherSide(getCommentInfo().side(), - diffChunkInfo.getEnd()); + parent.resizePaddingOnOtherSide(side, diffChunkInfo.getEnd()); } else { assert widgetManager != null; widgetManager.resizePaddingWidget(); @@ -97,4 +102,8 @@ abstract class CommentBox extends Composite { GutterWrapper getGutterWrapper() { return gutterWrapper; } + + DisplaySide getSide() { + return side; + } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java index 8ee10522b7..bb67ef042c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java @@ -14,7 +14,7 @@ package com.google.gerrit.client.diff; -import com.google.gerrit.common.changes.Side; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.resources.client.CssResource; @@ -87,10 +87,10 @@ class DiffTable extends Composite { private SideBySide2 host; DiffTable(SideBySide2 host, String path) { - patchSelectBoxA = new PatchSelectBox2(this, Side.PARENT); - patchSelectBoxB = new PatchSelectBox2(this, Side.REVISION); - fileCommentPanelA = new FileCommentPanel(host, this, path, Side.PARENT); - fileCommentPanelB = new FileCommentPanel(host, this, path, Side.REVISION); + patchSelectBoxA = new PatchSelectBox2(this, DisplaySide.A); + patchSelectBoxB = new PatchSelectBox2(this, DisplaySide.B); + fileCommentPanelA = new FileCommentPanel(host, this, path, DisplaySide.A); + fileCommentPanelB = new FileCommentPanel(host, this, path, DisplaySide.B); initWidget(uiBinder.createAndBindUi(this)); this.host = host; } @@ -111,21 +111,21 @@ class DiffTable extends Composite { host.resizeCodeMirror(); } - private FileCommentPanel getPanelFromSide(Side side) { - return side == Side.PARENT ? fileCommentPanelA : fileCommentPanelB; + private FileCommentPanel getPanelFromSide(DisplaySide side) { + return side == DisplaySide.A ? fileCommentPanelA : fileCommentPanelB; } - void createOrEditFileComment(Side side) { + void createOrEditFileComment(DisplaySide side) { getPanelFromSide(side).createOrEditFileComment(); updateFileCommentVisibility(false); } - void addFileCommentBox(CommentBox box, Side side) { - getPanelFromSide(side).addFileComment(box); + void addFileCommentBox(CommentBox box) { + getPanelFromSide(box.getSide()).addFileComment(box); } - void onRemoveDraftBox(DraftBox box, Side side) { - getPanelFromSide(side).onRemoveDraftBox(box); + void onRemoveDraftBox(DraftBox box) { + getPanelFromSide(box.getSide()).onRemoveDraftBox(box); } int getHeaderHeight() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java index 9e6cd57deb..d0dc86f1f3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DraftBox.java @@ -18,9 +18,9 @@ import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.changes.CommentApi; import com.google.gerrit.client.changes.CommentInfo; import com.google.gerrit.client.changes.CommentInput; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.CommentLinkProcessor; -import com.google.gerrit.common.changes.Side; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.JavaScriptObject; @@ -84,9 +84,12 @@ class DraftBox extends CommentBox { DraftBox( SideBySide2 parent, CodeMirror cm, + DisplaySide side, CommentLinkProcessor clp, PatchSet.Id id, CommentInfo info) { + super(side); + this.parent = parent; this.cm = cm; this.linkProcessor = clp; @@ -215,15 +218,14 @@ class DraftBox extends CommentBox { if (replyToBox != null) { replyToBox.unregisterReplyBox(); } - Side side = comment.side(); removeFromParent(); if (!getCommentInfo().has_line()) { - parent.removeFileCommentBox(this, side); + parent.removeFileCommentBox(this); return; } PaddingManager manager = getPaddingManager(); manager.remove(this); - parent.removeDraft(this, side, comment.line() - 1); + parent.removeDraft(this, comment.line() - 1); cm.focus(); getSelfWidgetWrapper().getWidget().clear(); getGutterWrapper().remove(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java index 7019388dd8..f4b7e3465b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java @@ -16,7 +16,7 @@ package com.google.gerrit.client.diff; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.changes.CommentInfo; -import com.google.gerrit.common.changes.Side; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; @@ -33,11 +33,11 @@ class FileCommentPanel extends Composite { private SideBySide2 parent; private DiffTable table; private String path; - private Side side; + private DisplaySide side; private List boxes; private FlowPanel body; - FileCommentPanel(SideBySide2 host, DiffTable table, String path, Side side) { + FileCommentPanel(SideBySide2 host, DiffTable table, String path, DisplaySide side) { this.parent = host; this.table = table; this.path = path; @@ -54,10 +54,10 @@ class FileCommentPanel extends Composite { if (boxes.isEmpty()) { CommentInfo info = CommentInfo.createFile( path, - side, + parent.getStoredSideFromDisplaySide(side), null, null); - addFileComment(parent.addDraftBox(info)); + addFileComment(parent.addDraftBox(info, side)); } else { CommentBox box = boxes.get(boxes.size() - 1); if (box instanceof DraftBox) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/LineMapper.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/LineMapper.java index aed0813c77..5eee49a049 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/LineMapper.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/LineMapper.java @@ -14,7 +14,7 @@ package com.google.gerrit.client.diff; -import com.google.gerrit.common.changes.Side; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import java.util.ArrayList; import java.util.Collections; @@ -98,8 +98,8 @@ class LineMapper { * - | 6 * ... */ - LineOnOtherInfo lineOnOther(Side mySide, int line) { - List lineGaps = mySide == Side.PARENT ? lineMapAtoB : lineMapBtoA; + LineOnOtherInfo lineOnOther(DisplaySide mySide, int line) { + List lineGaps = mySide == DisplaySide.A ? lineMapAtoB : lineMapBtoA; // Create a dummy LineGap for the search. int ret = Collections.binarySearch(lineGaps, new LineGap(line)); if (ret == -1) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSelectBox2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSelectBox2.java index 383482add0..521d96cabe 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSelectBox2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSelectBox2.java @@ -15,8 +15,8 @@ package com.google.gerrit.client.diff; import com.google.gerrit.client.Gerrit; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import com.google.gerrit.client.patches.PatchUtil; -import com.google.gerrit.common.changes.Side; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.uibinder.client.UiBinder; @@ -38,9 +38,9 @@ class PatchSelectBox2 extends Composite { Image icon; private DiffTable table; - private Side side; + private DisplaySide side; - PatchSelectBox2(DiffTable table, Side side) { + PatchSelectBox2(DiffTable table, DisplaySide side) { initWidget(uiBinder.createAndBindUi(this)); icon.setTitle(PatchUtil.C.addFileCommentToolTip()); icon.addStyleName(Gerrit.RESOURCES.css().link()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PublishedBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PublishedBox.java index 6298296f24..d52715e639 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PublishedBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PublishedBox.java @@ -21,6 +21,7 @@ import com.google.gerrit.client.changes.CommentApi; import com.google.gerrit.client.changes.CommentInfo; import com.google.gerrit.client.changes.CommentInput; import com.google.gerrit.client.changes.Util; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import com.google.gerrit.client.patches.PatchUtil; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.CommentLinkProcessor; @@ -68,9 +69,12 @@ class PublishedBox extends CommentBox { PublishedBox( SideBySide2 parent, + DisplaySide side, CommentLinkProcessor clp, PatchSet.Id psId, CommentInfo info) { + super(side); + this.parent = parent; this.psId = psId; this.comment = info; @@ -137,7 +141,7 @@ class PublishedBox extends CommentBox { } DraftBox addReplyBox() { - DraftBox box = parent.addDraftBox(parent.createReply(comment)); + DraftBox box = parent.addDraftBox(parent.createReply(comment), getSide()); registerReplyBox(box); return box; } @@ -148,7 +152,7 @@ class PublishedBox extends CommentBox { } else if (replyBox == null) { DraftBox box = addReplyBox(); if (!getCommentInfo().has_line()) { - parent.addFileCommentBox(box, comment.side()); + parent.addFileCommentBox(box); } } else { openReplyBox(); @@ -176,10 +180,10 @@ class PublishedBox extends CommentBox { public void onSuccess(CommentInfo result) { done.setEnabled(true); setOpen(false); - DraftBox box = parent.addDraftBox(result); + DraftBox box = parent.addDraftBox(result, getSide()); registerReplyBox(box); if (!getCommentInfo().has_line()) { - parent.addFileCommentBox(box, comment.side()); + parent.addFileCommentBox(box); } } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java index 3ad82f8593..8eb8f79d12 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java @@ -88,6 +88,10 @@ public class SideBySide2 extends Screen { interface Binder extends UiBinder {} private static Binder uiBinder = GWT.create(Binder.class); + enum DisplaySide { + A, B; + } + private static final JsArrayString EMPTY = JavaScriptObject.createArray().cast(); @@ -106,8 +110,10 @@ public class SideBySide2 extends Screen { private Timer scrollTimerA; private Timer scrollTimerB; private HandlerRegistration resizeHandler; - private JsArray published; - private JsArray drafts; + private JsArray publishedBase; + private JsArray publishedRevision; + private JsArray draftsBase; + private JsArray draftsRevision; private DiffInfo diff; private LineMapper mapper; private CommentLinkProcessor commentLinkProcessor; @@ -174,16 +180,14 @@ public class SideBySide2 extends Screen { } })); if (base != null) { - CommentApi.comments(base, group.add(getCommentCallback(false))); + CommentApi.comments(base, group.add(getCommentCallback(DisplaySide.A, false))); } - CommentApi.comments(revision, group.add(getCommentCallback(false))); + CommentApi.comments(revision, group.add(getCommentCallback(DisplaySide.B, false))); if (Gerrit.isSignedIn()) { if (base != null) { - CommentApi.drafts(base, group.add(getCommentCallback(true))); + CommentApi.drafts(base, group.add(getCommentCallback(DisplaySide.A, true))); } - CommentApi.drafts(revision, group.add(getCommentCallback(true))); - } else { - drafts = JsArray.createArray().cast(); + CommentApi.drafts(revision, group.add(getCommentCallback(DisplaySide.B, true))); } ConfigInfoCache.get(revision.getParentKey(), group.addFinal( new ScreenLoadCallback(SideBySide2.this) { @@ -312,31 +316,30 @@ public class SideBySide2 extends Screen { } private GerritCallback>> getCommentCallback( - final boolean toDrafts) { + final DisplaySide side, final boolean toDrafts) { return new GerritCallback>>() { @Override public void onSuccess(NativeMap> result) { JsArray in = result.get(path); if (in != null) { - addAllToCommentList(in, toDrafts); + if (toDrafts) { + if (side == DisplaySide.A) { + draftsBase = in; + } else { + draftsRevision = in; + } + } else { + if (side == DisplaySide.A) { + publishedBase = in; + } else { + publishedRevision = in; + } + } } } }; } - private void addAllToCommentList(JsArray in, boolean toDrafts) { - if (toDrafts && drafts == null) { - drafts = in; - } else if (!toDrafts && published == null) { - published = in; - } else { - JsArray dest = toDrafts ? drafts : published; - for (int i = 0; i < in.length(); i++) { - dest.push(in.get(i)); - } - } - } - private void display(DiffInfo diffInfo) { cmA = displaySide(diffInfo.meta_a(), diffInfo.text_a(), diffTable.cmA); cmB = displaySide(diffInfo.meta_b(), diffInfo.text_b(), diffTable.cmB); @@ -347,17 +350,22 @@ public class SideBySide2 extends Screen { lineActiveBoxMap = new HashMap(); lineLastPublishedBoxMap = new HashMap(); linePaddingManagerMap = new HashMap(); - if (published != null) { - publishedMap = new HashMap(published.length()); - renderPublished(); + if (publishedBase != null || publishedRevision != null) { + publishedMap = new HashMap(); } - if (drafts != null) { - renderDrafts(); + if (publishedBase != null) { + renderPublished(publishedBase); + } + if (publishedRevision != null) { + renderPublished(publishedRevision); + } + if (draftsBase != null) { + renderDrafts(draftsBase); + } + if (draftsRevision != null) { + renderDrafts(draftsRevision); } renderSkips(); - published = null; - drafts = null; - skips = null; registerCmEvents(cmA); registerCmEvents(cmB); resizeHandler = Window.addResizeHandler(new ResizeHandler() { @@ -464,11 +472,11 @@ public class SideBySide2 extends Screen { private DraftBox addNewDraft(CodeMirror cm, int line) { return addDraftBox(CommentInfo.createRange( path, - getSideFromCm(cm), + getStoredSideFromDisplaySide(getSideFromCm(cm)), line + 1, null, null, - null)); + null), getSideFromCm(cm)); } CommentInfo createReply(CommentInfo replyTo) { @@ -480,10 +488,9 @@ public class SideBySide2 extends Screen { } } - DraftBox addDraftBox(CommentInfo info) { - Side side = info.side(); + DraftBox addDraftBox(CommentInfo info, DisplaySide side) { CodeMirror cm = getCmFromSide(side); - final DraftBox box = new DraftBox(this, cm, commentLinkProcessor, + final DraftBox box = new DraftBox(this, cm, side, commentLinkProcessor, getPatchSetIdFromSide(side), info); if (info.id() == null) { Scheduler.get().scheduleDeferred(new ScheduledCommand() { @@ -505,8 +512,8 @@ public class SideBySide2 extends Screen { CommentBox addCommentBox(CommentInfo info, CommentBox box) { diffTable.add(box); - Side mySide = info.side(); - CodeMirror cm = mySide == Side.PARENT ? cmA : cmB; + DisplaySide side = box.getSide(); + CodeMirror cm = getCmFromSide(side); CodeMirror other = otherCm(cm); int line = info.line() - 1; // CommentInfo is 1-based, but CM is 0-based LineHandle handle = cm.getLineHandle(line); @@ -519,9 +526,9 @@ public class SideBySide2 extends Screen { addPaddingWidget(cm, DiffTable.style.padding(), line, 0, Unit.PX, 0)); linePaddingManagerMap.put(handle, manager); } - int lineToPad = mapper.lineOnOther(mySide, line).getLine(); + int lineToPad = mapper.lineOnOther(side, line).getLine(); LineHandle otherHandle = other.getLineHandle(lineToPad); - DiffChunkInfo myChunk = getDiffChunk(mySide, line); + DiffChunkInfo myChunk = getDiffChunk(side, line); DiffChunkInfo otherChunk = getDiffChunk(getSideFromCm(other), lineToPad); PaddingManager otherManager; if (linePaddingManagerMap.containsKey(otherHandle)) { @@ -553,20 +560,20 @@ public class SideBySide2 extends Screen { return box; } - void removeDraft(DraftBox box, Side side, int line) { - LineHandle handle = getCmFromSide(side).getLineHandle(line); + void removeDraft(DraftBox box, int line) { + LineHandle handle = getCmFromSide(box.getSide()).getLineHandle(line); lineActiveBoxMap.remove(handle); if (lineLastPublishedBoxMap.containsKey(handle)) { lineActiveBoxMap.put(handle, lineLastPublishedBoxMap.get(handle)); } } - void addFileCommentBox(CommentBox box, Side side) { - diffTable.addFileCommentBox(box, side); + void addFileCommentBox(CommentBox box) { + diffTable.addFileCommentBox(box); } - void removeFileCommentBox(DraftBox box, Side side) { - diffTable.onRemoveDraftBox(box, side); + void removeFileCommentBox(DraftBox box) { + diffTable.onRemoveDraftBox(box); } private List sortComment(JsArray unsorted) { @@ -583,16 +590,24 @@ public class SideBySide2 extends Screen { return sorted; } - private void renderPublished() { + private void renderPublished(JsArray published) { List sorted = sortComment(published); for (CommentInfo info : sorted) { - Side side = info.side(); + DisplaySide side; + if (info.side() == Side.PARENT) { + if (base != null) { + continue; + } + side = DisplaySide.A; + } else { + side = published == publishedBase ? DisplaySide.A : DisplaySide.B; + } CodeMirror cm = getCmFromSide(side); - PublishedBox box = new PublishedBox(this, commentLinkProcessor, + PublishedBox box = new PublishedBox(this, side, commentLinkProcessor, getPatchSetIdFromSide(side), info); publishedMap.put(info.id(), box); if (!info.has_line()) { - diffTable.addFileCommentBox(box, side); + diffTable.addFileCommentBox(box); continue; } int line = info.line() - 1; @@ -603,21 +618,29 @@ public class SideBySide2 extends Screen { } } - private void renderDrafts() { + private void renderDrafts(JsArray drafts) { List sorted = sortComment(drafts); for (CommentInfo info : sorted) { - Side side = info.side(); + DisplaySide side; + if (info.side() == Side.PARENT) { + if (base != null) { + continue; + } + side = DisplaySide.A; + } else { + side = drafts == draftsBase ? DisplaySide.A : DisplaySide.B; + } DraftBox box = new DraftBox( - this, getCmFromSide(side), commentLinkProcessor, + this, getCmFromSide(side), side, commentLinkProcessor, getPatchSetIdFromSide(side), info); - if (published != null) { + if (publishedBase != null || publishedRevision != null) { PublishedBox replyToBox = publishedMap.get(info.in_reply_to()); if (replyToBox != null) { replyToBox.registerReplyBox(box); } } if (!info.has_line()) { - diffTable.addFileCommentBox(box, side); + diffTable.addFileCommentBox(box); continue; } lineActiveBoxMap.put( @@ -714,16 +737,20 @@ public class SideBySide2 extends Screen { return me == cmA ? cmB : cmA; } - private PatchSet.Id getPatchSetIdFromSide(Side side) { - return side == Side.PARENT && base != null ? base : revision; + private PatchSet.Id getPatchSetIdFromSide(DisplaySide side) { + return side == DisplaySide.A && base != null ? base : revision; } - private CodeMirror getCmFromSide(Side side) { - return side == Side.PARENT ? cmA : cmB; + private CodeMirror getCmFromSide(DisplaySide side) { + return side == DisplaySide.A ? cmA : cmB; } - private Side getSideFromCm(CodeMirror cm) { - return cm == cmA ? Side.PARENT : Side.REVISION; + private DisplaySide getSideFromCm(CodeMirror cm) { + return cm == cmA ? DisplaySide.A : DisplaySide.B; + } + + Side getStoredSideFromDisplaySide(DisplaySide side) { + return side == DisplaySide.A && base == null ? Side.PARENT : Side.REVISION; } private void markEdit(CodeMirror cm, JsArrayString lines, @@ -974,7 +1001,7 @@ public class SideBySide2 extends Screen { }; } - private DiffChunkInfo getDiffChunk(Side side, int line) { + private DiffChunkInfo getDiffChunk(DisplaySide side, int line) { for (DiffChunkInfo info : diffChunks) { if (info.getSide() == side && info.getStart() <= line && line <= info.getEnd()) { @@ -984,7 +1011,7 @@ public class SideBySide2 extends Screen { return null; } - void resizePaddingOnOtherSide(Side mySide, int line) { + void resizePaddingOnOtherSide(DisplaySide mySide, int line) { CodeMirror cm = getCmFromSide(mySide); LineHandle handle = cm.getLineHandle(line); final LinePaddingWidgetWrapper otherWrapper = linePaddingOnOtherSideMap.get(handle); @@ -1030,7 +1057,7 @@ public class SideBySide2 extends Screen { } // TODO: Maybe integrate this with PaddingManager. - private RenderLineHandler resizeLinePadding(final Side side) { + private RenderLineHandler resizeLinePadding(final DisplaySide side) { return new RenderLineHandler() { @Override public void handle(final CodeMirror instance, final LineHandle handle, @@ -1121,17 +1148,17 @@ public class SideBySide2 extends Screen { } static class DiffChunkInfo { - private Side side; + private DisplaySide side; private int start; private int end; - DiffChunkInfo(Side side, int start, int end) { + DiffChunkInfo(DisplaySide side, int start, int end) { this.side = side; this.start = start; this.end = end; } - Side getSide() { + DisplaySide getSide() { return side; } diff --git a/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java b/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java index 96ba2b7dbb..749e3111e0 100644 --- a/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java +++ b/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java @@ -17,7 +17,7 @@ package com.google.gerrit.client.diff; import static org.junit.Assert.assertEquals; import com.google.gerrit.client.diff.LineMapper.LineOnOtherInfo; -import com.google.gerrit.common.changes.Side; +import com.google.gerrit.client.diff.SideBySide2.DisplaySide; import org.junit.Test; @@ -53,9 +53,9 @@ public class LineMapperTest { LineMapper mapper = new LineMapper(); mapper.appendCommon(10); assertEquals(new LineOnOtherInfo(9, true), - mapper.lineOnOther(Side.PARENT, 9)); + mapper.lineOnOther(DisplaySide.A, 9)); assertEquals(new LineOnOtherInfo(9, true), - mapper.lineOnOther(Side.REVISION, 9)); + mapper.lineOnOther(DisplaySide.B, 9)); } @Test @@ -63,9 +63,9 @@ public class LineMapperTest { LineMapper mapper = new LineMapper(); mapper.appendCommon(10); assertEquals(new LineOnOtherInfo(10, true), - mapper.lineOnOther(Side.PARENT, 10)); + mapper.lineOnOther(DisplaySide.A, 10)); assertEquals(new LineOnOtherInfo(10, true), - mapper.lineOnOther(Side.REVISION, 10)); + mapper.lineOnOther(DisplaySide.B, 10)); } @Test @@ -73,7 +73,7 @@ public class LineMapperTest { LineMapper mapper = new LineMapper(); mapper.appendInsert(10); assertEquals(new LineOnOtherInfo(-1, false), - mapper.lineOnOther(Side.REVISION, 9)); + mapper.lineOnOther(DisplaySide.B, 9)); } @Test @@ -81,9 +81,9 @@ public class LineMapperTest { LineMapper mapper = new LineMapper(); mapper.appendInsert(10); assertEquals(new LineOnOtherInfo(0, true), - mapper.lineOnOther(Side.REVISION, 10)); + mapper.lineOnOther(DisplaySide.B, 10)); assertEquals(new LineOnOtherInfo(10, true), - mapper.lineOnOther(Side.PARENT, 0)); + mapper.lineOnOther(DisplaySide.A, 0)); } @Test @@ -91,7 +91,7 @@ public class LineMapperTest { LineMapper mapper = new LineMapper(); mapper.appendDelete(10); assertEquals(new LineOnOtherInfo(-1, false), - mapper.lineOnOther(Side.PARENT, 9)); + mapper.lineOnOther(DisplaySide.A, 9)); } @Test @@ -99,8 +99,8 @@ public class LineMapperTest { LineMapper mapper = new LineMapper(); mapper.appendDelete(10); assertEquals(new LineOnOtherInfo(0, true), - mapper.lineOnOther(Side.PARENT, 10)); + mapper.lineOnOther(DisplaySide.A, 10)); assertEquals(new LineOnOtherInfo(10, true), - mapper.lineOnOther(Side.REVISION, 0)); + mapper.lineOnOther(DisplaySide.B, 0)); } }