From aa3ebb6032e8526c0de043b5bf47c6d24737a1e4 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Thu, 5 Dec 2013 17:54:42 -0800 Subject: [PATCH] Fix disable of new features in ChangeTable2 Columns were incorrectly computed in a few locations. Change-Id: Icab52737de8aa18e62d18f30f6973a34ab8c5344 --- .../google/gerrit/client/changes/ChangeTable2.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java index 3070e1bf75..ce405942e0 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java @@ -167,18 +167,19 @@ public class ChangeTable2 extends NavigationTable { } Collections.sort(labelNames); - if (BASE_COLUMNS + labelNames.size() < columns) { - int n = columns - (BASE_COLUMNS + labelNames.size()); + int baseColumns = useNewFeatures ? BASE_COLUMNS : BASE_COLUMNS - 1; + if (baseColumns + labelNames.size() < columns) { + int n = columns - (baseColumns + labelNames.size()); for (int row = 0; row < table.getRowCount(); row++) { table.removeCells(row, columns, n); } } - columns = BASE_COLUMNS + labelNames.size(); + columns = baseColumns + labelNames.size(); FlexCellFormatter fmt = table.getFlexCellFormatter(); for (int i = 0; i < labelNames.size(); i++) { String name = labelNames.get(i); - int col = BASE_COLUMNS + i; + int col = baseColumns + i; StringBuilder abbrev = new StringBuilder(); for (String t : name.split("-")) { @@ -235,7 +236,7 @@ public class ChangeTable2 extends NavigationTable { } int col = C_SIZE; if (useNewFeatures) { - table.setText(row, col, + table.setText(row, col++, Util.M.insertionsAndDeletions(c.insertions(), c.deletions())); }