[jbosstools-commits] JBoss Tools SVN: r39089 - branches/jbosstools-3.3.0.Beta1/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
Author: fbricon
Date: 2012-02-24 03:39:27 -0500 (Fri, 24 Feb 2012)
New Revision: 39089
Modified:
branches/jbosstools-3.3.0.Beta1/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
Log:
JBIDE-11039 : fix unsorted Wizards in the New Project section
Modified:
branches/jbosstools-3.3.0.Beta1/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-02-24
08:37:41 UTC (rev 39088)
+++
branches/jbosstools-3.3.0.Beta1/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-02-24
08:39:27 UTC (rev 39089)
@@ -14,6 +14,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -553,23 +554,29 @@
IExtensionPoint extensionPoint =
extensionRegistry.getExtensionPoint("org.eclipse.ui.newWizards");
IExtension[] extensions = extensionPoint.getExtensions();
- List<String> wizardIDs =
ProjectExamplesActivator.getDefault().getConfigurator().getWizardIds();
+ List<String> sortedWizardIds =
ProjectExamplesActivator.getDefault().getConfigurator().getWizardIds();
- List<String> createdIDs = new ArrayList<String>();
+ Map<String, IConfigurationElement> wizards = new HashMap<String,
IConfigurationElement>(sortedWizardIds.size());
for (IExtension extension : extensions) {
- IConfigurationElement[] elements = extension
- .getConfigurationElements();
+ IConfigurationElement[] elements = extension.getConfigurationElements();
for (IConfigurationElement element : elements) {
String id = element.getAttribute("id");
- if (wizardIDs.contains(id) && !createdIDs.contains(id)) {
- createProjectLink(toolkit, projectsComposite, element);
- createdIDs.add(id);
+ if (sortedWizardIds.contains(id) && wizards.get(id) == null) {
+ wizards.put(id, element);
}
}
}
+ for (String wid : sortedWizardIds){
+ IConfigurationElement element = wizards.get(wid);
+ if (element != null) {
+ createProjectLink(toolkit, projectsComposite, element);
+ }
+ }
+
projectsSection.setClient(projectsComposite);
}
+
private void createProjectLink(FormToolkit toolkit, Composite composite,
final IConfigurationElement element) {
if (element == null) {
@@ -1235,14 +1242,7 @@
}
setBusyIndicator(tutorialsLoadingComposite, false);
refreshTutorials();
-
- //TEMPORARY HACK FOR JBIDE-10053 (Java EE6 archetypes in the project section)
- //Should be removed once these archetype tutorials are changed to use wizards as per
JBIDE-10264
-// RefreshTutorialsJob job = RefreshTutorialsJob.INSTANCE;
-// List<ProjectExample> wizardProjects = job.getWizardProjects();
-// if (wizardProjects != null){
-// updateNewProjects(wizardProjects);
-// }
+
}
});