diff options
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java')
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java | 212 |
1 files changed, 15 insertions, 197 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java index ef4ef52771..97a5a09dd5 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java @@ -16,10 +16,7 @@ package com.google.gerrit.client.changes; import static com.google.gerrit.client.FormatUtil.shortFormat; -import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.patches.PatchUtil; -import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.AccountLink; import com.google.gerrit.client.ui.BranchLink; import com.google.gerrit.client.ui.ChangeLink; @@ -27,70 +24,36 @@ import com.google.gerrit.client.ui.NavigationTable; import com.google.gerrit.client.ui.NeedsSignInKeyCommand; import com.google.gerrit.client.ui.ProjectLink; import com.google.gerrit.common.PageLinks; -import com.google.gerrit.common.data.AccountInfo; import com.google.gerrit.common.data.AccountInfoCache; -import com.google.gerrit.common.data.ApprovalSummary; -import com.google.gerrit.common.data.ApprovalSummarySet; -import com.google.gerrit.common.data.ApprovalType; import com.google.gerrit.common.data.ChangeInfo; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; -import com.google.gerrit.reviewdb.client.ApprovalCategory; -import com.google.gerrit.reviewdb.client.ApprovalCategoryValue; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.reviewdb.client.PatchSetApproval; -import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.dom.client.KeyPressEvent; -import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; -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.Image; -import com.google.gwt.user.client.ui.InlineLabel; -import com.google.gwt.user.client.ui.UIObject; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; public class ChangeTable extends NavigationTable<ChangeInfo> { private static final int C_STAR = 1; - private static final int C_ID = 2; - private static final int C_SUBJECT = 3; - private static final int C_OWNER = 4; - private static final int C_PROJECT = 5; - private static final int C_BRANCH = 6; - private static final int C_LAST_UPDATE = 7; - private static final int BASE_COLUMNS = 8; + private static final int C_SUBJECT = 2; + private static final int C_OWNER = 3; + private static final int C_PROJECT = 4; + private static final int C_BRANCH = 5; + private static final int C_LAST_UPDATE = 6; + private static final int COLUMNS = 7; private final List<Section> sections; private AccountInfoCache accountCache = AccountInfoCache.empty(); - private final List<ApprovalType> approvalTypes; - private final int columns; public ChangeTable() { - this(false); - } - - public ChangeTable(boolean showApprovals) { - approvalTypes = Gerrit.getConfig().getApprovalTypes().getApprovalTypes(); - if (showApprovals) { - columns = BASE_COLUMNS + approvalTypes.size(); - } else { - columns = BASE_COLUMNS; - } - - keysNavigation.add(new PrevKeyCommand(0, 'k', Util.C.changeTablePrev())); - keysNavigation.add(new NextKeyCommand(0, 'j', Util.C.changeTableNext())); - keysNavigation.add(new OpenKeyCommand(0, 'o', Util.C.changeTableOpen())); - keysNavigation.add(new OpenKeyCommand(0, KeyCodes.KEY_ENTER, Util.C - .changeTableOpen())); + super(Util.C.changeItemHelp()); if (Gerrit.isSignedIn()) { keysAction.add(new StarKeyCommand(0, 's', Util.C.changeTableStar())); @@ -98,29 +61,15 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { sections = new ArrayList<Section>(); table.setText(0, C_STAR, ""); - table.setText(0, C_ID, Util.C.changeTableColumnID()); table.setText(0, C_SUBJECT, Util.C.changeTableColumnSubject()); table.setText(0, C_OWNER, Util.C.changeTableColumnOwner()); table.setText(0, C_PROJECT, Util.C.changeTableColumnProject()); table.setText(0, C_BRANCH, Util.C.changeTableColumnBranch()); table.setText(0, C_LAST_UPDATE, Util.C.changeTableColumnLastUpdate()); - for (int i = BASE_COLUMNS; i < columns; i++) { - final ApprovalType type = approvalTypes.get(i - BASE_COLUMNS); - final ApprovalCategory cat = type.getCategory(); - String text = cat.getAbbreviatedName(); - if (text == null) { - text = cat.getName(); - } - table.setText(0, i, text); - if (text != null) { - table.getCellFormatter().getElement(0, i).setTitle(cat.getName()); - } - } final FlexCellFormatter fmt = table.getFlexCellFormatter(); fmt.addStyleName(0, C_STAR, Gerrit.RESOURCES.css().iconHeader()); - fmt.addStyleName(0, C_ID, Gerrit.RESOURCES.css().cID()); - for (int i = C_ID; i < columns; i++) { + for (int i = C_SUBJECT; i < COLUMNS; i++) { fmt.addStyleName(0, i, Gerrit.RESOURCES.css().dataHeader()); } @@ -164,7 +113,7 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { insertRow(row); table.setText(row, 0, Util.C.changeTableNone()); final FlexCellFormatter fmt = table.getFlexCellFormatter(); - fmt.setColSpan(row, 0, columns); + fmt.setColSpan(row, 0, COLUMNS); fmt.setStyleName(row, 0, Gerrit.RESOURCES.css().emptySection()); } @@ -178,17 +127,12 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { super.applyDataRowStyle(row); final CellFormatter fmt = table.getCellFormatter(); fmt.addStyleName(row, C_STAR, Gerrit.RESOURCES.css().iconCell()); - for (int i = C_ID; i < columns; i++) { + for (int i = C_SUBJECT; i < COLUMNS; i++) { fmt.addStyleName(row, i, Gerrit.RESOURCES.css().dataCell()); } - fmt.addStyleName(row, C_ID, Gerrit.RESOURCES.css().cID()); fmt.addStyleName(row, C_SUBJECT, Gerrit.RESOURCES.css().cSUBJECT()); - fmt.addStyleName(row, C_PROJECT, Gerrit.RESOURCES.css().cPROJECT()); - fmt.addStyleName(row, C_BRANCH, Gerrit.RESOURCES.css().cPROJECT()); + fmt.addStyleName(row, C_OWNER, Gerrit.RESOURCES.css().cOWNER()); fmt.addStyleName(row, C_LAST_UPDATE, Gerrit.RESOURCES.css().cLastUpdate()); - for (int i = BASE_COLUMNS; i < columns; i++) { - fmt.addStyleName(row, i, Gerrit.RESOURCES.css().cAPPROVAL()); - } } private void populateChangeRow(final int row, final ChangeInfo c, @@ -196,12 +140,10 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { ChangeCache cache = ChangeCache.get(c.getId()); cache.getChangeInfoCache().set(c); - final String idstr = c.getKey().abbreviate(); table.setWidget(row, C_ARROW, null); if (Gerrit.isSignedIn()) { table.setWidget(row, C_STAR, StarredChanges.createIcon(c.getId(), c.isStarred())); } - table.setWidget(row, C_ID, new TableChangeLink(idstr, c)); String s = Util.cropSubject(c.getSubject()); if (c.getStatus() != null && c.getStatus() != Change.Status.NEW) { @@ -251,7 +193,7 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { s.titleRow = table.getRowCount(); table.setText(s.titleRow, 0, s.titleText); final FlexCellFormatter fmt = table.getFlexCellFormatter(); - fmt.setColSpan(s.titleRow, 0, columns); + fmt.setColSpan(s.titleRow, 0, COLUMNS); fmt.addStyleName(s.titleRow, 0, Gerrit.RESOURCES.css().sectionHeader()); } else { s.titleRow = -1; @@ -292,110 +234,6 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { table.removeRow(row); } - private void displayApprovals(final int row, final ApprovalSummary summary, - final AccountInfoCache aic, final boolean highlightUnreviewed) { - final CellFormatter fmt = table.getCellFormatter(); - final Map<ApprovalCategory.Id, PatchSetApproval> approvals = - summary.getApprovalMap(); - int col = BASE_COLUMNS; - boolean haveReview = false; - - boolean showUsernameInReviewCategory = false; - - if (Gerrit.isSignedIn()) { - AccountGeneralPreferences prefs = Gerrit.getUserAccount().getGeneralPreferences(); - - if (prefs.isShowUsernameInReviewCategory()) { - showUsernameInReviewCategory = true; - } - } - - for (final ApprovalType type : approvalTypes) { - final PatchSetApproval ca = approvals.get(type.getCategory().getId()); - - fmt.removeStyleName(row, col, Gerrit.RESOURCES.css().negscore()); - fmt.removeStyleName(row, col, Gerrit.RESOURCES.css().posscore()); - fmt.addStyleName(row, col, Gerrit.RESOURCES.css().singleLine()); - - if (ca == null || ca.getValue() == 0) { - table.clearCell(row, col); - - } else { - haveReview = true; - - final ApprovalCategoryValue acv = type.getValue(ca); - final AccountInfo ai = aic.get(ca.getAccountId()); - - if (type.isMaxNegative(ca)) { - - if (showUsernameInReviewCategory) { - FlowPanel fp = new FlowPanel(); - fp.add(new Image(Gerrit.RESOURCES.redNot())); - fp.add(new InlineLabel(FormatUtil.name(ai))); - table.setWidget(row, col, fp); - } else { - table.setWidget(row, col, new Image(Gerrit.RESOURCES.redNot())); - } - - } else if (type.isMaxPositive(ca)) { - - if (showUsernameInReviewCategory) { - FlowPanel fp = new FlowPanel(); - fp.add(new Image(Gerrit.RESOURCES.greenCheck())); - fp.add(new InlineLabel(FormatUtil.name(ai))); - table.setWidget(row, col, fp); - } else { - table.setWidget(row, col, new Image(Gerrit.RESOURCES.greenCheck())); - } - - } else { - String vstr = String.valueOf(ca.getValue()); - - if (showUsernameInReviewCategory) { - vstr = vstr + " " + FormatUtil.name(ai); - } - - if (ca.getValue() > 0) { - vstr = "+" + vstr; - fmt.addStyleName(row, col, Gerrit.RESOURCES.css().posscore()); - } else { - fmt.addStyleName(row, col, Gerrit.RESOURCES.css().negscore()); - } - table.setText(row, col, vstr); - } - - // Some web browsers ignore the embedded newline; some like it; - // so we include a space before the newline to accommodate both. - // - fmt.getElement(row, col).setTitle( - acv.getName() + " \nby " + FormatUtil.nameEmail(ai)); - } - - col++; - } - - final Element tr = DOM.getParent(fmt.getElement(row, 0)); - UIObject.setStyleName(tr, Gerrit.RESOURCES.css().needsReview(), !haveReview - && highlightUnreviewed); - } - - GerritCallback<ApprovalSummarySet> approvalFormatter(final int dataBegin, - final int rows, final boolean highlightUnreviewed) { - return new GerritCallback<ApprovalSummarySet>() { - @Override - public void onSuccess(final ApprovalSummarySet as) { - Map<Change.Id, ApprovalSummary> ids = as.getSummaryMap(); - AccountInfoCache aic = as.getAccountInfoCache(); - for (int row = dataBegin; row < dataBegin + rows; row++) { - final ChangeInfo c = getRowItem(row); - if (ids.containsKey(c.getId())) { - displayApprovals(row, ids.get(c.getId()), aic, highlightUnreviewed); - } - } - } - }; - } - public class StarKeyCommand extends NeedsSignInKeyCommand { public StarKeyCommand(int mask, char key, String help) { super(mask, key, help); @@ -419,15 +257,10 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { } } - public enum ApprovalViewType { - NONE, USER, STRONGEST - } - public static class Section { String titleText; ChangeTable parent; - final ApprovalViewType viewType; final Account.Id ownerId; int titleRow = -1; int dataBegin; @@ -436,17 +269,15 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { private ChangeRowFormatter changeRowFormatter; public Section() { - this(null, ApprovalViewType.NONE, null); + this(null, null); } public Section(final String titleText) { - this(titleText, ApprovalViewType.NONE, null); + this(titleText, null); } - public Section(final String titleText, final ApprovalViewType view, - final Account.Id owner) { + public Section(final String titleText, final Account.Id owner) { setTitleText(titleText); - viewType = view; ownerId = owner; } @@ -493,19 +324,6 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { parent.populateChangeRow(dataBegin + i, c, changeRowFormatter); cids.add(c.getId()); } - - switch (viewType) { - case NONE: - break; - case USER: - PatchUtil.DETAIL_SVC.userApprovals(cids, ownerId, parent - .approvalFormatter(dataBegin, rows, true)); - break; - case STRONGEST: - PatchUtil.DETAIL_SVC.strongestApprovals(cids, parent - .approvalFormatter(dataBegin, rows, false)); - break; - } } } } |