Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Anderson2013-03-15 14:46:12 +0000
committerCarl Anderson2013-03-15 14:46:12 +0000
commit8d52a48b6aa6b3dec878c71837f0b91181992462 (patch)
tree7ebab13d75a8f136645b17dd317b7d188bc2e62b /plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet
parent65d5c5e359899ac9d88485eb8235102fbdee843b (diff)
downloadwebtools.javaee-8d52a48b6aa6b3dec878c71837f0b91181992462.tar.gz
webtools.javaee-8d52a48b6aa6b3dec878c71837f0b91181992462.tar.xz
webtools.javaee-8d52a48b6aa6b3dec878c71837f0b91181992462.zip
[400488] Java EE 7 Project creation for core module typesv201303151600
Diffstat (limited to 'plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet')
-rw-r--r--plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
index 1b86aa5e2..38ba6b1a3 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
@@ -18,7 +18,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
import org.eclipse.jst.j2ee.web.project.facet.IWebFragmentProjectCreationDataModelProperties;
import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
@@ -101,9 +101,13 @@ public class WebFragmentProjectFirstPage extends J2EEComponentFacetCreationWizar
else {
facets.add(primaryFacetVersion);
- if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_30)
+ if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_31)
{
- facets.add(JavaFacetUtils.JAVA_60);
+ facets.add(JavaFacet.VERSION_1_7);
+ }
+ else if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_30)
+ {
+ facets.add(JavaFacet.VERSION_1_6);
}
}
return Collections.unmodifiableSet( facets );

Back to the top