Author: scabanovich
Date: 2010-07-29 08:20:11 -0400 (Thu, 29 Jul 2010)
New Revision: 23787
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
Log:
https://jira.jboss.org/browse/JBIDE-6730
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2010-07-29
00:05:11 UTC (rev 23786)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2010-07-29
12:20:11 UTC (rev 23787)
@@ -394,6 +394,7 @@
FacetDataModelMap map = (FacetDataModelMap)
dataModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
IDataModel configDM = (IDataModel) map.get("jst.web"); //$NON-NLS-1$
+ IDataModel configJavaDM = (IDataModel) map.get("java"); //$NON-NLS-1$
boolean hasJSTWebFacet = false;
if(exists) {
@@ -410,9 +411,12 @@
}
}
- if(sv != null && (sv.indexOf("2.3") >= 0 ||
sv.indexOf("2.5") >= 0)) { //$NON-NLS-1$ //$NON-NLS-2$
+ if(sv != null && (sv.indexOf("2.3") >= 0 ||
sv.indexOf("2.5") >= 0 || sv.indexOf("3.0") >= 0)) {
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
configDM.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, sv);
}
+ if(configJavaDM != null && sv != null && sv.indexOf("3.0")
>= 0) { //$NON-NLS-1$
+ configJavaDM.setProperty(IFacetDataModelProperties.FACET_VERSION_STR,
"1.6"); //$NON-NLS-1$
+ }
if(webroot != null) {
int i = webroot.lastIndexOf("/"); //$NON-NLS-1$