summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcos Munoz2012-09-05 16:42:40 (EDT)
committer Roberto Sanchez2012-09-05 16:42:40 (EDT)
commit2e860306bf6ee74fa7d4cb12a9fa6cb30f7a2c71 (patch)
treee26f3bdb416014a256c83f44772ec317adc9da46
parent0fdc45fa9371cf3c2c592a9f73cca7618e9bff7d (diff)
downloadwebtools.javaee-2e860306bf6ee74fa7d4cb12a9fa6cb30f7a2c71.zip
webtools.javaee-2e860306bf6ee74fa7d4cb12a9fa6cb30f7a2c71.tar.gz
webtools.javaee-2e860306bf6ee74fa7d4cb12a9fa6cb30f7a2c71.tar.bz2
[388618] Inconsistency in ADD_TO_EAR property modelv201209052200
-rw-r--r--plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
index 1049ca2..3ffc495 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
@@ -66,6 +67,8 @@ public class J2EEFacetProjectCreationDataModelProvider extends FacetProjectCreat
IDataModel nestedJ2EEFacetDataModel = getJ2EEFacetModel();
if (nestedJ2EEFacetDataModel!=null)
return nestedJ2EEFacetDataModel.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
+ }else if (propertyName.equals(ADD_TO_EAR)) {
+ return new Boolean( J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.ADD_TO_EAR_BY_DEFAULT));
}
return super.getDefaultProperty(propertyName);
}