From b98e65a84c436428764c78362d9d40775ddfa6fe Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Thu, 3 May 2007 13:29:35 +0000 Subject: [PATCH] Sort project types in New Project Wizard --- .../ui/properties/BuildListComparator.java | 9 ++++++++- .../managedbuilder/ui/wizards/ManagedBuildWizard.java | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java index 4823fd568ed..7a45da43d84 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.properties; +import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue; import org.eclipse.cdt.managedbuilder.core.ITool; import org.eclipse.cdt.ui.newui.CDTListComparator; @@ -31,7 +32,13 @@ public class BuildListComparator extends CDTListComparator { ITool c1 = (ITool)a; ITool c2 = (ITool)b; return c1.getName().compareToIgnoreCase(c2.getName()); - } + } + if (a instanceof IBuildPropertyValue) { + IBuildPropertyValue c1 = (IBuildPropertyValue)a; + IBuildPropertyValue c2 = (IBuildPropertyValue)b; + return c1.getName().compareToIgnoreCase(c2.getName()); + } + return super.compare(a, b); } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java index bd287dcfe70..a930b8ccc8f 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java @@ -11,6 +11,7 @@ package org.eclipse.cdt.managedbuilder.ui.wizards; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.SortedMap; @@ -22,6 +23,7 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IProjectType; import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; +import org.eclipse.cdt.managedbuilder.ui.properties.BuildListComparator; import org.eclipse.cdt.managedbuilder.ui.properties.Messages; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.cdt.ui.wizards.EntryDescriptor; @@ -41,6 +43,7 @@ public class ManagedBuildWizard extends AbstractCWizard { IBuildPropertyManager bpm = ManagedBuildManager.getBuildPropertyManager(); IBuildPropertyType bpt = bpm.getPropertyType(MBSWizardHandler.ARTIFACT); IBuildPropertyValue[] vs = bpt.getSupportedValues(); + Arrays.sort(vs, BuildListComparator.getInstance()); ArrayList items = new ArrayList(); // new style project types