Merge changes I332152c3,I7d36578e,Ib6fb9bdd
* changes:
ChangeScreen2: Do not display 'M' next to modified files
ChangeScreen2: Clean up FileTable status column CSS
ChangeScreen2: Remove unnecessary in FileTable
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
index 23787af..77a0091 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
@@ -27,6 +27,7 @@
import com.google.gerrit.client.ui.NavigationTable;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Patch;
+import com.google.gerrit.reviewdb.client.Patch.ChangeType;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.JsArray;
@@ -65,6 +66,7 @@
interface FileTableCss extends CssResource {
String pointer();
String reviewed();
+ String status();
String pathColumn();
String draftColumn();
String newColumn();
@@ -74,7 +76,6 @@
String commonPrefix();
String inserted();
String deleted();
- String statusTypeCell();
}
private static final String REVIEWED;
@@ -412,7 +413,7 @@
sb.openTr();
sb.openTh().setStyleName(R.css().pointer()).closeTh();
sb.openTh().setStyleName(R.css().reviewed()).closeTh();
- sb.openTh().setStyleName(R.css().statusTypeCell()).closeTh();
+ sb.openTh().setStyleName(R.css().status()).closeTh();
sb.openTh().append(Util.C.patchTableColumnName()).closeTh();
sb.openTh()
.setAttribute("colspan", 3)
@@ -450,10 +451,10 @@
}
private void columnStatus(SafeHtmlBuilder sb, FileInfo info) {
- sb.openTd().setStyleName(R.css().statusTypeCell());
- if (Patch.COMMIT_MSG.equals(info.path())) {
- sb.nbsp();
- } else {
+ sb.openTd().setStyleName(R.css().status());
+ if (!Patch.COMMIT_MSG.equals(info.path())
+ && info.status() != null
+ && !ChangeType.MODIFIED.matches(info.status())) {
sb.append(info.status());
}
sb.closeTd();
@@ -586,7 +587,7 @@
sb.openTr();
sb.openTh().setStyleName(R.css().pointer()).closeTh();
sb.openTh().setStyleName(R.css().reviewed()).closeTh();
- sb.openTh().setStyleName(R.css().statusTypeCell()).closeTh();
+ sb.openTh().setStyleName(R.css().status()).closeTh();
sb.openTd().closeTd(); // path
sb.openTd().setAttribute("colspan", 3).closeTd(); // comments
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css
index 810c35b..a9d5a38 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css
@@ -19,6 +19,11 @@
vertical-align: top;
}
+.status {
+ padding-right: 4px;
+ color: #888;
+}
+
.pathColumn {
white-space: nowrap;
min-width: 600px;
@@ -66,11 +71,3 @@
background-color: #d44;
}
-.statusTypeCell {
- width: 1px;
- padding-left: 5px;
- padding-right: 5px;
- border-right: 1px solid trimColor;
- border-bottom: 1px solid trimColor;
- vertical-align: top;
-}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java
index 6ddd6d2..f5ecd2e 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java
@@ -97,6 +97,10 @@
return code;
}
+ public boolean matches(String s) {
+ return s != null && s.length() == 1 && s.charAt(0) == code;
+ }
+
public static ChangeType forCode(final char c) {
for (final ChangeType s : ChangeType.values()) {
if (s.code == c) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
index f5a0313..65b96b3 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
@@ -56,7 +56,8 @@
Map<String, FileInfo> files = Maps.newTreeMap();
for (PatchListEntry e : list.getPatches()) {
FileInfoJson.FileInfo d = new FileInfoJson.FileInfo();
- d.status = e.getChangeType().getCode();
+ d.status = e.getChangeType() != Patch.ChangeType.MODIFIED
+ ? e.getChangeType().getCode() : null;
d.oldPath = e.getOldName();
if (e.getPatchType() == Patch.PatchType.BINARY) {
d.binary = true;
