diff options
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java')
-rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java index 80b179605c..addd692306 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java @@ -16,6 +16,8 @@ package com.google.gerrit.client.change; import static com.google.gwt.event.dom.client.KeyCodes.KEY_ENTER; import static com.google.gwt.event.dom.client.KeyCodes.KEY_MAC_ENTER; +import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.toList; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.changes.ChangeApi; @@ -123,11 +125,13 @@ public class ReplyBox extends Composite { this.lc = new LocalComments(project, psId.getParentKey()); initWidget(uiBinder.createAndBindUi(this)); - List<String> names = new ArrayList<>(permitted.keySet()); + List<String> names = + permitted.keySet().stream() + .sorted() + .collect(collectingAndThen(toList(), Collections::unmodifiableList)); if (names.isEmpty()) { UIObject.setVisible(labelsParent, false); } else { - Collections.sort(names); renderLabels(names, all, permitted); } @@ -373,7 +377,7 @@ public class ReplyBox extends Composite { fmt.setStyleName(row, labelHelpColumn, style.label_help()); ApprovalInfo self = - Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount().getId().get()) : null; + Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount()._accountId()) : null; final LabelRadioGroup group = new LabelRadioGroup(row, id, lv.permitted.size()); for (int i = 0; i < columns.size(); i++) { @@ -395,7 +399,7 @@ public class ReplyBox extends Composite { private void renderCheckBox(int row, LabelAndValues lv) { ApprovalInfo self = - Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount().getId().get()) : null; + Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount()._accountId()) : null; final String id = lv.info.name(); final CheckBox b = new CheckBox(); @@ -439,8 +443,10 @@ public class ReplyBox extends Composite { clp, project, psId, Util.C.commitMessage(), copyPath(Patch.MERGE_LIST, l))); } - List<String> paths = new ArrayList<>(m.keySet()); - Collections.sort(paths); + List<String> paths = + m.keySet().stream() + .sorted() + .collect(collectingAndThen(toList(), Collections::unmodifiableList)); for (String path : paths) { if (!Patch.isMagic(path)) { |