Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Anderson2013-03-14 17:27:38 +0000
committerCarl Anderson2013-03-14 17:27:38 +0000
commite33156340e26c037c5efbf9e1af776424e52a21b (patch)
tree6f7130462e864041a0b622c5cacbdd2051cad218 /plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse
parent9ce94007bd30e83a4dff750a96cc1fa737f71b13 (diff)
downloadwebtools.javaee-e33156340e26c037c5efbf9e1af776424e52a21b.tar.gz
webtools.javaee-e33156340e26c037c5efbf9e1af776424e52a21b.tar.xz
webtools.javaee-e33156340e26c037c5efbf9e1af776424e52a21b.zip
[399524] Basic Java EE 7 supportv201303141900
Diffstat (limited to 'plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse')
-rw-r--r--plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java2
-rw-r--r--plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java19
2 files changed, 12 insertions, 9 deletions
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
index a6409d08f..1fe44dcdf 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
@@ -30,7 +30,7 @@ public class ConvertToWebModuleTypeDialog extends Dialog {
private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE;
private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION;
private static String fSelection= null;
- private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT};
+ private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT, J2EEVersionConstants.VERSION_3_1_TEXT};
private int fInitialSelectionIndex = fAllowedStrings.length-1;
public static String getSelectedVersion() {
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
index fe4506f5c..8eac03222 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
@@ -15,7 +15,7 @@ import java.util.Collections;
import java.util.HashSet;
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.plugin.J2EEUIPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
@@ -55,22 +55,25 @@ public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
else {
facets.add( primaryFacetVersion );
- if( primaryFacetVersion == WebFacetUtils.WEB_30)
+ if( primaryFacetVersion == WebFacetUtils.WEB_31 )
{
- facets.add( JavaFacetUtils.JAVA_60 );
+ facets.add( JavaFacet.VERSION_1_7 );
+ }
+ else if( primaryFacetVersion == WebFacetUtils.WEB_30 )
+ {
+ facets.add( JavaFacet.VERSION_1_6 );
}
else if(primaryFacetVersion == WebFacetUtils.WEB_25 )
{
- facets.add( JavaFacetUtils.JAVA_50 );
+ facets.add( JavaFacet.VERSION_1_5 );
}
else if( primaryFacetVersion == WebFacetUtils.WEB_24 )
{
- facets.add( JavaFacetUtils.JAVA_14 );
+ facets.add( JavaFacet.VERSION_1_4 );
}
- else if( primaryFacetVersion == WebFacetUtils.WEB_23 ||
- primaryFacetVersion == WebFacetUtils.WEB_22 )
+ else if( primaryFacetVersion == WebFacetUtils.WEB_23 || primaryFacetVersion == WebFacetUtils.WEB_22 )
{
- facets.add( JavaFacetUtils.JAVA_13 );
+ facets.add( JavaFacet.VERSION_1_3 );
}
}
return Collections.unmodifiableSet( facets );

Back to the top