[309204] Default java facet is inconsistent between web projects vs other projects

5 files changed, 133 insertions, 19 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
index 2ec3d8877..5fea36649 100644
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Require-Bundle: org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)"
+ org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
index f13ae7a98..e6d7f46d5 100644
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
+++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
@@ -10,13 +10,21 @@
  *******************************************************************************/
 package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
 import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
 import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
 import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
 import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
 
 public class ConnectorProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
 
@@ -32,5 +40,32 @@ public class ConnectorProjectFirstPage extends J2EEComponentFacetCreationWizardP
 	protected String getModuleFacetID() {
 		return IJ2EEFacetConstants.JCA;
 	}
-
+	
+	@Override
+	protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
+	{
+		IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
+	    final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
+	    
+	    if(runtime != null) {
+	    	facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
+	    }
+	    else {
+		    facets.add(primaryFacetVersion);
+		    
+		    if( primaryFacetVersion == IJ2EEFacetConstants.JCA_16)
+		    {
+		        facets.add(JavaFacet.VERSION_1_6);
+		    }
+		    else if(primaryFacetVersion == IJ2EEFacetConstants.JCA_15)
+		    {
+		        facets.add(JavaFacet.VERSION_1_4);
+		    }
+		    else if( primaryFacetVersion == IJ2EEFacetConstants.JCA_10)
+		    {
+		        facets.add(JavaFacet.VERSION_1_3);
+		    }
+	    }
+	    return Collections.unmodifiableSet( facets );
+	}
 }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
index e2a1c05ef..b9d0fe42a 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
@@ -10,13 +10,22 @@
  *******************************************************************************/
 package org.eclipse.jst.j2ee.ui.project.facet.appclient;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.jst.common.project.facet.JavaFacetUtils;
 import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
 import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
 import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
 
 public class AppClientProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
 
@@ -33,4 +42,36 @@ public class AppClientProjectFirstPage extends J2EEComponentFacetCreationWizardP
 		return J2EEProjectUtilities.APPLICATION_CLIENT;
 	}
 
+	@Override
+	protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
+	{
+		IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
+	    final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
+	    
+	    if(runtime != null) {
+	    	facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
+	    }
+	    else {
+		    facets.add( primaryFacetVersion );
+		    
+		    if( primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_60)
+		    {
+		        facets.add( JavaFacetUtils.JAVA_60 );
+		    }
+		    else if(primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_50)
+		    {
+		        facets.add( JavaFacetUtils.JAVA_50 );
+		    }
+		    else if( primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_14)
+		    {
+		        facets.add( JavaFacetUtils.JAVA_14 );
+		    }
+		    else if( primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_13 ||
+		             primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_12 )
+		    {
+		        facets.add( JavaFacetUtils.JAVA_13 );
+		    }
+	    }
+	    return Collections.unmodifiableSet( facets );
+	}
 }
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 9dee1b755..1b86aa5e2 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
@@ -13,18 +13,26 @@ package org.eclipse.jst.servlet.ui.project.facet;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
+import org.eclipse.jst.common.project.facet.JavaFacetUtils;
 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;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
 import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.project.facet.core.IFacetedProject;
 import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
 import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
 
 public class WebFragmentProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
 
@@ -80,5 +88,24 @@ public class WebFragmentProjectFirstPage extends J2EEComponentFacetCreationWizar
 	protected String getModuleFacetID() {
 		return IModuleConstants.JST_WEBFRAGMENT_MODULE;
 	}
-		
+	
+	@Override
+	protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
+	{
+		IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
+	    final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
+	    
+	    if(runtime != null) {
+	    	facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
+	    }
+	    else {
+		    facets.add(primaryFacetVersion);
+		    
+		    if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_30)
+		    {
+		        facets.add(JavaFacetUtils.JAVA_60);
+		    }
+	    }
+	    return Collections.unmodifiableSet( facets );
+	}
 }
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 70035479f..fe4506f5c 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
@@ -23,8 +23,10 @@ import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage
 import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
 import org.eclipse.jst.servlet.ui.IWebUIContextIds;
 import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
 
 public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
 
@@ -44,26 +46,34 @@ public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
 	@Override
 	protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
 	{
+		IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
 	    final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
 	    
-	    facets.add( primaryFacetVersion );
-	    
-	    if( primaryFacetVersion == WebFacetUtils.WEB_30 || 
-	    	primaryFacetVersion == WebFacetUtils.WEB_25 )
-	    {
-	        facets.add( JavaFacetUtils.JAVA_50 );
-	    }
-	    else if( primaryFacetVersion == WebFacetUtils.WEB_24 )
-	    {
-	        facets.add( JavaFacetUtils.JAVA_14 );
+	    if(runtime != null) {
+	    	facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
 	    }
-	    else if( primaryFacetVersion == WebFacetUtils.WEB_23 ||
-	             primaryFacetVersion == WebFacetUtils.WEB_22 )
-	    {
-	        facets.add( JavaFacetUtils.JAVA_13 );
+	    else {
+		    facets.add( primaryFacetVersion );
+		    
+		    if( primaryFacetVersion == WebFacetUtils.WEB_30)
+		    {
+		        facets.add( JavaFacetUtils.JAVA_60 );
+		    }
+		    else if(primaryFacetVersion == WebFacetUtils.WEB_25 )
+		    {
+		        facets.add( JavaFacetUtils.JAVA_50 );
+		    }
+		    else if( primaryFacetVersion == WebFacetUtils.WEB_24 )
+		    {
+		        facets.add( JavaFacetUtils.JAVA_14 );
+		    }
+		    else if( primaryFacetVersion == WebFacetUtils.WEB_23 ||
+		             primaryFacetVersion == WebFacetUtils.WEB_22 )
+		    {
+		        facets.add( JavaFacetUtils.JAVA_13 );
+		    }
 	    }
-	    
-	    return Collections.unmodifiableSet( facets );
+		return Collections.unmodifiableSet( facets );
 	}
 
 }