Author: snjeza Date: 2009-03-03 10:57:40 -0500 (Tue, 03 Mar 2009) New Revision: 13960 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java Log: JBIDE-3610 JBDS 2.0.0.CR1 Uses Java 6 when environment only has Java 5 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2009-03-03 15:48:22 UTC (rev 13959) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2009-03-03 15:57:40 UTC (rev 13960) @@ -10,11 +10,19 @@ ******************************************************************************/ package org.jboss.tools.esb.project.ui.wizards.pages; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.jst.common.project.facet.JavaFacetUtils; +import org.eclipse.jst.common.project.facet.core.internal.JavaFacetUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +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.web.ui.internal.wizards.DataModelFacetCreationWizardPage; import org.jboss.tools.esb.core.ESBProjectConstant; import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages; @@ -47,4 +55,25 @@ } + @Override + protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion ) + { + final Set<IProjectFacetVersion> config = new HashSet<IProjectFacetVersion>(); + IFacetedProjectWorkingCopy fpjwc = (IFacetedProjectWorkingCopy) this.model + .getProperty(FACETED_PROJECT_WORKING_COPY); + for (IProjectFacet fixedFacet : fpjwc.getFixedProjectFacets()) { + if (fixedFacet == primaryFacetVersion.getProjectFacet()) { + config.add(primaryFacetVersion); + } else if (fixedFacet == JavaFacetUtils.JAVA_FACET) { + String compilerLevel = JavaFacetUtil.getCompilerLevel(); + IProjectFacetVersion facetVersion = JavaFacetUtil.compilerLevelToFacet(compilerLevel); + config.add(facetVersion); + } else { + config.add(fpjwc.getHighestAvailableVersion(fixedFacet)); + } + } + + return config; + } + }