summaryrefslogtreecommitdiffstats
path: root/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
diff options
context:
space:
mode:
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java')
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java157
1 files changed, 141 insertions, 16 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
index 2939e714f2..6379e23121 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
@@ -25,11 +25,17 @@ import com.google.gerrit.common.data.PatchScript;
import com.google.gerrit.common.data.PatchScript.FileMode;
import com.google.gerrit.prettify.common.EditList;
import com.google.gerrit.prettify.common.SparseHtmlFile;
-import com.google.gerrit.reviewdb.Patch;
-import com.google.gerrit.reviewdb.PatchLineComment;
-import com.google.gerrit.reviewdb.Patch.ChangeType;
+import com.google.gerrit.reviewdb.client.Patch;
+import com.google.gerrit.reviewdb.client.PatchLineComment;
+import com.google.gerrit.reviewdb.client.Patch.ChangeType;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.ui.Anchor;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HTMLTable.Cell;
import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
+import com.google.gwt.user.client.ui.Label;
import com.google.gwtexpui.safehtml.client.SafeHtml;
import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder;
import com.google.gwtorm.client.KeyUtil;
@@ -44,6 +50,11 @@ public class SideBySideTable extends AbstractPatchContentTable {
private static final int COL_A = 2;
private static final int COL_B = 4;
+ private static final int NUM_ROWS_TO_EXPAND = 10;
+
+ private SparseHtmlFile a;
+ private SparseHtmlFile b;
+
@Override
protected void onCellDoubleClick(final int row, int column) {
if (column > 0 && getRowItem(row) instanceof PatchLine) {
@@ -64,6 +75,13 @@ public class SideBySideTable extends AbstractPatchContentTable {
}
@Override
+ protected void onCellSingleClick(int row, int column) {
+ if (column == 1 || column == 3) {
+ onCellDoubleClick(row, column);
+ }
+ }
+
+ @Override
protected void onInsertComment(final PatchLine line) {
final int row = getCurrentRow();
createCommentEditor(row + 1, 4, line.getLineB(), (short) 1);
@@ -71,9 +89,9 @@ public class SideBySideTable extends AbstractPatchContentTable {
@Override
protected void render(final PatchScript script) {
- final SparseHtmlFile a = script.getSparseHtmlFileA();
- final SparseHtmlFile b = script.getSparseHtmlFileB();
- final ArrayList<PatchLine> lines = new ArrayList<PatchLine>();
+ a = getSparseHtmlFileA(script);
+ b = getSparseHtmlFileB(script);
+ final ArrayList<Object> lines = new ArrayList<Object>();
final SafeHtmlBuilder nc = new SafeHtmlBuilder();
final boolean intraline =
script.getDiffPrefs().isIntralineDifference()
@@ -90,12 +108,13 @@ public class SideBySideTable extends AbstractPatchContentTable {
lines.add(null);
}
+ int lastA = 0;
int lastB = 0;
final boolean ignoreWS = script.isIgnoreWhitespace();
for (final EditList.Hunk hunk : script.getHunks()) {
if (!hunk.isStartOfFile()) {
appendSkipLine(nc, hunk.getCurB() - lastB);
- lines.add(null);
+ lines.add(new SkippedLine(lastA, lastB, hunk.getCurB() - lastB));
}
while (hunk.next()) {
@@ -149,16 +168,21 @@ public class SideBySideTable extends AbstractPatchContentTable {
}
}
}
+ lastA = hunk.getCurA();
lastB = hunk.getCurB();
}
if (lastB != b.size()) {
appendSkipLine(nc, b.size() - lastB);
+ lines.add(new SkippedLine(lastA, lastB, b.size() - lastB));
}
resetHtml(nc);
initScript(script);
for (int row = 0; row < lines.size(); row++) {
setRowItem(row, lines.get(row));
+ if (lines.get(row) instanceof SkippedLine) {
+ createSkipLine(row, (SkippedLine) lines.get(row));
+ }
}
}
@@ -186,7 +210,7 @@ public class SideBySideTable extends AbstractPatchContentTable {
}
@Override
- public void display(final CommentDetail cd) {
+ public void display(final CommentDetail cd, boolean expandComments) {
if (cd.isEmpty()) {
return;
}
@@ -205,13 +229,13 @@ public class SideBySideTable extends AbstractPatchContentTable {
final PatchLineComment ac = ai.next();
final PatchLineComment bc = bi.next();
insertRow(row);
- bindComment(row, COL_A, ac, !ai.hasNext());
- bindComment(row, COL_B, bc, !bi.hasNext());
+ bindComment(row, COL_A, ac, !ai.hasNext(), expandComments);
+ bindComment(row, COL_B, bc, !bi.hasNext(), expandComments);
row++;
}
- row = finish(ai, row, COL_A);
- row = finish(bi, row, COL_B);
+ row = finish(ai, row, COL_A, expandComments);
+ row = finish(bi, row, COL_B, expandComments);
} else {
row++;
}
@@ -228,11 +252,11 @@ public class SideBySideTable extends AbstractPatchContentTable {
fmt.addStyleName(row, COL_B, Gerrit.RESOURCES.css().diffText());
}
- private int finish(final Iterator<PatchLineComment> i, int row, final int col) {
+ private int finish(final Iterator<PatchLineComment> i, int row, final int col, boolean expandComment) {
while (i.hasNext()) {
final PatchLineComment c = i.next();
insertRow(row);
- bindComment(row, col, c, !i.hasNext());
+ bindComment(row, col, c, !i.hasNext(), expandComment);
row++;
}
return row;
@@ -308,11 +332,112 @@ public class SideBySideTable extends AbstractPatchContentTable {
m.openTd();
m.setStyleName(Gerrit.RESOURCES.css().skipLine());
m.setAttribute("colspan", 4);
- m.append(PatchUtil.M.patchSkipRegion(skipCnt));
m.closeTd();
m.closeTr();
}
+ ClickHandler expandAllListener = new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ expand(event, 0);
+ }
+ };
+
+ ClickHandler expandBeforeListener = new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ expand(event, NUM_ROWS_TO_EXPAND);
+ }
+ };
+
+ ClickHandler expandAfterListener = new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ expand(event, -NUM_ROWS_TO_EXPAND);
+ }
+ };
+
+ private void expand(ClickEvent event, final int numRows) {
+ Cell cell = table.getCellForEvent(event);
+ int row = cell.getRowIndex();
+ if (!(getRowItem(row) instanceof SkippedLine)) {
+ return;
+ }
+ SkippedLine line = (SkippedLine) getRowItem(row);
+ int loopTo = numRows;
+ if (numRows == 0) {
+ loopTo = line.getSize();
+ } else if (numRows < 0) {
+ loopTo = -numRows;
+ }
+ int offset = 0;
+ if (numRows < 0) {
+ offset = 1;
+ }
+ for (int i = 0 + offset; i < loopTo + offset; i++) {
+ insertRow(row + i);
+ int lineA = line.getStartA() + i;
+ int lineB = line.getStartB() + i;
+ if (numRows < 0) {
+ lineA = line.getStartA() + line.getSize() + numRows + i - offset;
+ lineB = line.getStartB() + line.getSize() + numRows + i - offset;
+ }
+ setHtml(row + i, 1, "<a href=\"javascript:void(0)\">" + (lineA + 1)
+ + "</a>");
+ addStyle(row + i, 1, Gerrit.RESOURCES.css().lineNumber());
+
+ setHtml(row + i, 2, a.getSafeHtmlLine(lineA).asString());
+ addStyle(row + i, 2, Gerrit.RESOURCES.css().fileLine());
+ addStyle(row + i, 2, Gerrit.RESOURCES.css().fileLineCONTEXT());
+
+ setHtml(row + i, 3, "<a href=\"javascript:void(0)\">" + (lineB + 1)
+ + "</a>");
+ addStyle(row + i, 3, Gerrit.RESOURCES.css().lineNumber());
+
+ setHtml(row + i, 4, b.getSafeHtmlLine(lineB).asString());
+ addStyle(row + i, 4, Gerrit.RESOURCES.css().fileLine());
+ addStyle(row + i, 4, Gerrit.RESOURCES.css().fileLineCONTEXT());
+
+ setRowItem(row + i, new PatchLine(CONTEXT, lineA, lineB));
+ }
+
+ if (numRows > 0) {
+ line.incrementStart(numRows);
+ createSkipLine(row + loopTo, line);
+ } else if (numRows < 0) {
+ line.reduceSize(-numRows);
+ createSkipLine(row, line);
+ } else {
+ removeRow(row + loopTo);
+ }
+ }
+
+ private void createSkipLine(int row, SkippedLine line) {
+ FlowPanel p = new FlowPanel();
+ Label l1 = new Label(" " + PatchUtil.C.patchSkipRegionStart() + " ");
+ Anchor all = new Anchor(String.valueOf(line.getSize()));
+ Label l2 = new Label(" " + PatchUtil.C.patchSkipRegionEnd() + " ");
+ all.addClickHandler(expandAllListener);
+ if (line.getSize() > 30) {
+ // We only show the expand before & after links if we skip more than
+ // 30 lines.
+ Anchor before = new Anchor(PatchUtil.M.expandBefore(NUM_ROWS_TO_EXPAND));
+ before.addClickHandler(expandBeforeListener);
+ Anchor after = new Anchor(PatchUtil.M.expandAfter(NUM_ROWS_TO_EXPAND));
+ after.addClickHandler(expandAfterListener);
+ p.add(before);
+ p.add(l1);
+ p.add(all);
+ p.add(l2);
+ p.add(after);
+ } else {
+ p.add(l1);
+ p.add(all);
+ p.add(l2);
+ }
+ setWidget(row, 1, p);
+ }
+
private void openLine(final SafeHtmlBuilder m) {
m.openTr();
m.setAttribute("valign", "top");
@@ -335,7 +460,7 @@ public class SideBySideTable extends AbstractPatchContentTable {
final boolean fullBlock) {
m.openTd();
m.setStyleName(Gerrit.RESOURCES.css().lineNumber());
- m.append(lineNumberMinusOne + 1);
+ m.append(SafeHtml.asis("<a href=\"javascript:void(0)\">"+ (lineNumberMinusOne + 1) + "</a>"));
m.closeTd();
m.openTd();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 16:30:12 +0000