opendev/gerrit
Code Issues Proposed changes

Add insert/delete styles to image cells in unified diffs

Browse Source 
In patch sets that add or delete an image, only one image is shown.
Since there was no background styling, one had to look at the headers
to find out whether the image got added or deleted. We now set the
correct styles, and therefore looking at the cell's background
suffices to see whether it was an addition or deletion.

For pictures, where the styling gets in the way (e.g.: partly
transparent pictures against white background), styling can by turned
off in the same way as for text.

Change-Id: I5341ce1a587c5ae98118831bfef5f61143935ec6
This commit is contained in:
Christian Aistleitner
2013-04-24 17:34:17 +02:00
committed by Gerrit Code Review
parent f1542110b3
commit 7629381466
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
View File

@@ -271,7 +271,8 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
}
}
private void appendImageLine(final SafeHtmlBuilder nc, final String url) {
private void appendImageLine(final SafeHtmlBuilder nc, final String url,
final boolean syntaxHighlighting, final boolean isInsert) {
nc.openTr();
nc.setAttribute("valign", "center");
nc.setAttribute("align", "center");
@@ -285,6 +286,11 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
nc.openTd();
nc.setStyleName(Gerrit.RESOURCES.css().fileLine());
if (isInsert) {
setStyleInsert(nc, syntaxHighlighting);
} else {
setStyleDelete(nc, syntaxHighlighting);
}
appendImgTag(nc, url);
nc.closeTd();
@@ -293,6 +299,8 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
private void appendImageDifferences(final PatchScript script,
final SafeHtmlBuilder nc) {
final boolean syntaxHighlighting =
script.getDiffPrefs().isSyntaxHighlighting();
final String rawBase = GWT.getHostPageBaseURL() + "cat/";
if (script.getDisplayMethodA() == DisplayMethod.IMG) {
@@ -303,11 +311,11 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
Patch.Key k = new Patch.Key(idSideA, patchKey.get());
url = rawBase + KeyUtil.encode(k.toString()) + "^0";
}
appendImageLine(nc, url);
appendImageLine(nc, url, syntaxHighlighting, false);
}
if (script.getDisplayMethodB() == DisplayMethod.IMG) {
final String url = rawBase + KeyUtil.encode(patchKey.toString()) + "^0";
appendImageLine(nc, url);
appendImageLine(nc, url, syntaxHighlighting, true);
}
}
@@ -531,6 +539,22 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
}
}
private void setStyleDelete(final SafeHtmlBuilder m,
boolean syntaxHighlighting) {
m.addStyleName(Gerrit.RESOURCES.css().diffTextDELETE());
if (syntaxHighlighting) {
m.addStyleName(Gerrit.RESOURCES.css().fileLineDELETE());
}
}
private void setStyleInsert(final SafeHtmlBuilder m,
boolean syntaxHighlighting) {
m.addStyleName(Gerrit.RESOURCES.css().diffTextINSERT());
if (syntaxHighlighting) {
m.addStyleName(Gerrit.RESOURCES.css().fileLineINSERT());
}
}
private void appendLineText(final SafeHtmlBuilder m,
boolean syntaxHighlighting, final PatchLine.Type type,
final SparseHtmlFile src, final int i) {
@@ -545,18 +569,12 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
m.append(text);
break;
case DELETE:
m.addStyleName(Gerrit.RESOURCES.css().diffTextDELETE());
if (syntaxHighlighting) {
m.addStyleName(Gerrit.RESOURCES.css().fileLineDELETE());
}
setStyleDelete(m, syntaxHighlighting);
m.append("-");
m.append(text);
break;
case INSERT:
m.addStyleName(Gerrit.RESOURCES.css().diffTextINSERT());
if (syntaxHighlighting) {
m.addStyleName(Gerrit.RESOURCES.css().fileLineINSERT());
}
setStyleInsert(m, syntaxHighlighting);
m.append("+");
m.append(text);
break;