[jbosstools-commits] JBoss Tools SVN: r42182 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2012-06-22 17:49:26 -0400 (Fri, 22 Jun 2012)
New Revision: 42182

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
https://issues.jboss.org/browse/JBIDE-12184 EJB and EAR projects are not generated when proper option is checked

Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java	2012-06-22 21:35:57 UTC (rev 42181)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java	2012-06-22 21:49:26 UTC (rev 42182)
@@ -245,25 +245,27 @@
 		for (Action action : actions) {
 			if(ISeamFacetDataModelProperties.SEAM_FACET_ID.equals(action.getProjectFacetVersion().getProjectFacet().getId())) {
 				IDataModel model = (IDataModel)action.getConfig();
-				Object targetServer = this.model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER);
-				if(targetServer!=null) {
-					model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, targetServer);
-				}
-				Object targetRuntime = this.model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME);
-				if(targetRuntime!=null) {
-					Object targetRuntimeName = targetRuntime;
-					if(targetRuntime instanceof IRuntime) {
-						targetRuntimeName = ((IRuntime)targetRuntime).getName();
+				if(model!=null) {
+					Object targetServer = this.model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER);
+					if(targetServer!=null) {
+						model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, targetServer);
 					}
-					model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME, targetRuntimeName);
+					Object targetRuntime = this.model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME);
+					if(targetRuntime!=null) {
+						Object targetRuntimeName = targetRuntime;
+						if(targetRuntime instanceof IRuntime) {
+							targetRuntimeName = ((IRuntime)targetRuntime).getName();
+						}
+						model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME, targetRuntimeName);
+					}
+					final DataModelSynchHelper synchHelper = firstPage.initializeSynchHelper(model);
+					Display.getDefault().syncExec(new Runnable() {
+						public void run() {
+							synchHelper.synchCombo(matchedServerTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, dependentServerControls);
+							synchHelper.synchCombo(serverRuntimeTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME, null);
+						}
+					});
 				}
-				final DataModelSynchHelper synchHelper = firstPage.initializeSynchHelper(model);
-				Display.getDefault().syncExec(new Runnable() {
-					public void run() {
-						synchHelper.synchCombo(matchedServerTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, dependentServerControls);
-						synchHelper.synchCombo(serverRuntimeTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME, null);
-					}
-				});
 			}
 		}
 	}