opendev/gerrit
Code Issues Proposed changes

Fix disable of new features in ChangeTable2

Browse Source 
Columns were incorrectly computed in a few locations.

Change-Id: Icab52737de8aa18e62d18f30f6973a34ab8c5344
This commit is contained in:
Shawn Pearce
2013-12-05 17:54:42 -08:00
parent 16a606eadf
commit aa3ebb6032
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java
View File

@@ -167,18 +167,19 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
} }
Collections.sort(labelNames); Collections.sort(labelNames);
if (BASE_COLUMNS + labelNames.size() < columns) { int baseColumns = useNewFeatures ? BASE_COLUMNS : BASE_COLUMNS - 1;
int n = columns - (BASE_COLUMNS + labelNames.size()); if (baseColumns + labelNames.size() < columns) {
int n = columns - (baseColumns + labelNames.size());
for (int row = 0; row < table.getRowCount(); row++) { for (int row = 0; row < table.getRowCount(); row++) {
table.removeCells(row, columns, n); table.removeCells(row, columns, n);
} }
} }
columns = BASE_COLUMNS + labelNames.size(); columns = baseColumns + labelNames.size();
FlexCellFormatter fmt = table.getFlexCellFormatter(); FlexCellFormatter fmt = table.getFlexCellFormatter();
for (int i = 0; i < labelNames.size(); i++) { for (int i = 0; i < labelNames.size(); i++) {
String name = labelNames.get(i); String name = labelNames.get(i);
int col = BASE_COLUMNS + i; int col = baseColumns + i;
StringBuilder abbrev = new StringBuilder(); StringBuilder abbrev = new StringBuilder();
for (String t : name.split("-")) { for (String t : name.split("-")) {
@@ -235,7 +236,7 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
} }
int col = C_SIZE; int col = C_SIZE;
if (useNewFeatures) { if (useNewFeatures) {
table.setText(row, col, table.setText(row, col++,
Util.M.insertionsAndDeletions(c.insertions(), c.deletions())); Util.M.insertionsAndDeletions(c.insertions(), c.deletions()));
} }