diff options
| author | Andrey Loskutov | 2018-10-03 08:56:06 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2018-10-03 08:56:06 +0000 |
| commit | a8b84b39af6719611bf70577cbea054a7df0781c (patch) | |
| tree | f64bb0dd7e4b54f69002c84fcc20439db3f5c33f | |
| parent | 27d2a0ead515295171a816f0e587ba2e6f1a27a4 (diff) | |
| download | eclipse.platform.ui-a8b84b39af6719611bf70577cbea054a7df0781c.tar.gz eclipse.platform.ui-a8b84b39af6719611bf70577cbea054a7df0781c.tar.xz eclipse.platform.ui-a8b84b39af6719611bf70577cbea054a7df0781c.zip | |
Bug 539670 - [regression][Open Resource] dialog results not sorted by
project name
Change-Id: Ic922021c9ef05016dca4028b2c48f48e9913574d
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2 files changed, 20 insertions, 14 deletions
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java index 327a9af20bd..3ef3aa4d04c 100644 --- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java +++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java @@ -448,12 +448,14 @@ public class FilteredResourcesSelectionDialog extends String patternNoExtension = patternDot == -1 ? pattern : pattern.substring(0, patternDot); boolean m1 = patternNoExtension.equals(n1); boolean m2 = patternNoExtension.equals(n2); - if (m1 && m2) - return 0; - if (m1) - return -1; - if (m2) - return 1; + if (!m1 || !m2) { + if (m1) { + return -1; + } + if (m2) { + return 1; + } + } } int comparability = collator.compare(n1, n2); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java index 8f957ae964b..27ed7cdf481 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java @@ -3089,12 +3089,14 @@ public abstract class FilteredItemsSelectionDialog extends SelectionStatusDialog // See if any are exact matches boolean m1 = filterPattern.equals(getElementName(o1)); boolean m2 = filterPattern.equals(getElementName(o2)); - if (m1 && m2) - return 0; - if (m1 && !m2) - return -1; - if (m2 && !m1) - return 1; + if (!m1 || !m2) { + if (m1 && !m2) { + return -1; + } + if (m2 && !m1) { + return 1; + } + } } boolean h1 = isHistoryElement(o1); @@ -3103,10 +3105,12 @@ public abstract class FilteredItemsSelectionDialog extends SelectionStatusDialog return itemsComparator.compare(o1, o2); } - if (h1) + if (h1) { return -2; - if (h2) + } + if (h2) { return +2; + } return 0; } |