[jbosstools-commits] JBoss Tools SVN: r41755 - in trunk: maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2012-06-06 15:47:52 -0400 (Wed, 06 Jun 2012)
New Revision: 41755

Modified:
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java
   trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
Log:
JBDS-2198 - Projects created via JBoss Central page are not added to working sets

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java	2012-06-06 17:50:57 UTC (rev 41754)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java	2012-06-06 19:47:52 UTC (rev 41755)
@@ -24,6 +24,7 @@
 
 public class NewProjectExamplesJob extends WorkspaceJob {
 
+	private static final String WORKING_SETS = "workingSets"; //$NON-NLS-1$
 	private List<ProjectExample> selectedProjects;
 	private List<ProjectExample> projects = new ArrayList<ProjectExample>();
 	private IWorkingSet[] workingSets;
@@ -71,6 +72,15 @@
 				} else {
 					return Status.CANCEL_STATUS;
 				}
+				if (workingSets == null || workingSets.length == 0) {
+					if (propertiesMap != null) {
+						Object object = propertiesMap.get(WORKING_SETS);
+						if (object instanceof List<?>) {
+							List<IWorkingSet> list = (List<IWorkingSet>) object;
+							workingSets = list.toArray(new IWorkingSet[0]);
+						}
+					}
+				}
 				if (workingSets != null && workingSets.length > 0 && project.getIncludedProjects() != null) {
 					for (String projectName:project.getIncludedProjects()) {
 						IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java	2012-06-06 17:50:57 UTC (rev 41754)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java	2012-06-06 19:47:52 UTC (rev 41755)
@@ -108,7 +108,7 @@
 			if (!ProjectExamplesActivator.MAVEN_ARCHETYPE.equals(projectExample.getImportType())) {
 				workingSets = locationPage.getWorkingSets();
 			} else {
-			// FIXME
+				// 
 			}
 			String type = projectExample.getImportType();
 			for (IProjectExamplesWizardPage contributedPage:contributedPages) {

Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java	2012-06-06 17:50:57 UTC (rev 41754)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java	2012-06-06 19:47:52 UTC (rev 41755)
@@ -14,6 +14,7 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -74,6 +75,7 @@
  */
 public class ArchetypeExamplesWizardFirstPage extends MavenProjectWizardLocationPage implements IProjectExamplesWizardPage {
 
+	private static final String WORKING_SETS = "workingSets"; //$NON-NLS-1$
 	private static final String TARGET_RUNTIME = "targetRuntime"; //$NON-NLS-1$
 	private Label projectNameLabel;
 	private Combo projectNameCombo;
@@ -546,6 +548,18 @@
 
 	@Override
 	public Map<String, Object> getPropertiesMap() {
+		try {
+			Field field = this.getClass().getSuperclass().getDeclaredField(WORKING_SETS);
+			field.setAccessible(true);
+			Object object = field.get(this);
+			if (object instanceof List<?>) {
+				Map<String, Object> propertiesMap = new HashMap<String, Object>();
+				propertiesMap.put(WORKING_SETS, object); 
+				return propertiesMap;
+			}
+		} catch (Exception e) {
+			MavenProjectExamplesActivator.log(e);
+		} 
 		return null;
 	}