From 4e453840a6abef72154b039b65464da1089e7d40 Mon Sep 17 00:00:00 2001 From: Jaxsun McCarthy Huggan Date: Tue, 14 Feb 2017 18:00:42 -0800 Subject: 512204: sort reviewers list by reviewer name Change-Id: I956f942934b8f7211ee21444dc51dc53509fe1d7 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=512204 Signed-off-by: Jaxsun McCarthy Huggan --- .../mylyn/reviews/ui/spi/editor/ReviewDetailSection.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'org.eclipse.mylyn.reviews.ui/src') diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/spi/editor/ReviewDetailSection.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/spi/editor/ReviewDetailSection.java index dcd103bc0..ab632e896 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/spi/editor/ReviewDetailSection.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/spi/editor/ReviewDetailSection.java @@ -15,7 +15,9 @@ package org.eclipse.mylyn.reviews.ui.spi.editor; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.TreeMap; import org.apache.commons.lang.StringUtils; import org.eclipse.jface.layout.GridDataFactory; @@ -146,13 +148,17 @@ public abstract class ReviewDetailSection extends AbstractReviewSection { AbstractUiFactoryProvider reviewerUiFactoryProvider = getReviewerUiFactoryProvider(); - for (Entry entry : getReview().getReviewerApprovals().entrySet()) { - IUser currentUser = entry.getKey(); + Map sortedReviewerApprovals = new TreeMap<>( + (u1, u2) -> u1.getDisplayName().compareTo(u2.getDisplayName())); + sortedReviewerApprovals.putAll(getReview().getReviewerApprovals()); + + for (Entry approval : sortedReviewerApprovals.entrySet()) { + IUser currentUser = approval.getKey(); createReviewerLabelAndControls(composite, reviewerUiFactoryProvider, currentUser); for (IApprovalType approvalType : approvalTypesWithLabel) { - Integer value = entry.getValue().getApprovals().get(approvalType); + Integer value = approval.getValue().getApprovals().get(approvalType); Label approvalValueLabel = new Label(composite, SWT.NONE); GridDataFactory.fillDefaults().align(SWT.CENTER, SWT.FILL).applyTo(approvalValueLabel); String rankingText = " "; //$NON-NLS-1$ -- cgit v1.2.3