Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2018-06-23 01:59:23 -0400
committerThomas Wolf2018-06-23 10:57:19 -0400
commite2802e8e2800de1ec06c95f7a8f266e39e88527f (patch)
tree71c4a548f36b8532df4df151dbd08af1901b9120 /org.eclipse.egit.ui/src/org/eclipse/egit/ui
parentea10d4984e36ba3c792988adf11c986b205059a6 (diff)
downloadegit-e2802e8e2800de1ec06c95f7a8f266e39e88527f.tar.gz
egit-e2802e8e2800de1ec06c95f7a8f266e39e88527f.tar.xz
egit-e2802e8e2800de1ec06c95f7a8f266e39e88527f.zip
Sort gerrit remote refs naturally
Found two more instances of sorting just as String, and not in natural order. Change-Id: I96efda5b137c2be23fd5b46d9298d414a6b82dfe Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Bug:536204
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/gerrit/GerritConfigurationPage.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/gerrit/GerritConfigurationPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/gerrit/GerritConfigurationPage.java
index 433a0bfe6..b6ea34414 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/gerrit/GerritConfigurationPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/gerrit/GerritConfigurationPage.java
@@ -21,6 +21,7 @@ import java.util.TreeSet;
import org.eclipse.egit.core.internal.gerrit.GerritUtil;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.UIUtils;
+import org.eclipse.egit.ui.internal.CommonUtils;
import org.eclipse.egit.ui.internal.SWTUtils;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.internal.components.RepositorySelectionPage.Protocol;
@@ -305,7 +306,7 @@ class GerritConfigurationPage extends WizardPage {
() -> {
try {
Set<String> sortedSet = new TreeSet<>(
- String.CASE_INSENSITIVE_ORDER);
+ CommonUtils.STRING_ASCENDING_COMPARATOR);
sortedSet.addAll(repository.getRefDatabase()
.getRefs(Constants.R_REMOTES + remoteName + '/')
.keySet());
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java
index 60261e165..2f83481fc 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushToGerritPage.java
@@ -104,7 +104,7 @@ public class PushToGerritPage extends WizardPage {
private Text topicText;
private Set<String> knownRemoteRefs = new TreeSet<>(
- String.CASE_INSENSITIVE_ORDER);
+ CommonUtils.STRING_ASCENDING_COMPARATOR);
@SuppressWarnings("serial")
private Map<String, String> topicProposals = new LinkedHashMap<String, String>(

Back to the top