Author: rob.stryker(a)jboss.com Date: 2010-05-24 08:48:21 -0400 (Mon, 24 May 2010) New Revision: 22279 Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java Log: JBIDE-6220 - compilation errors Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java =================================================================== --- branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-24 12:46:25 UTC (rev 22278) +++ branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-24 12:48:21 UTC (rev 22279) @@ -10,12 +10,14 @@ ******************************************************************************/ package org.jboss.tools.esb.project.ui.wizards.pages; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jst.common.project.facet.JavaFacetUtils; -import org.eclipse.jst.common.project.facet.core.internal.JavaFacetUtil; +import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -61,30 +63,49 @@ } + @Override protected IDialogSettings getDialogSettings() { return J2EEUIPlugin.getDefault().getDialogSettings(); } @Override - protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion ) - { + 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 if (fixedFacet == JavaFacet.FACET) { + IProjectFacetVersion v = getDefaultJavaVersion(); + config.add(getDefaultJavaVersion()); } else { config.add(fpjwc.getHighestAvailableVersion(fixedFacet)); } } - return config; } + + private static final Map<String,IProjectFacetVersion> EXEC_ENV_TO_FACET_VER= new HashMap<String,IProjectFacetVersion>(); + static { + EXEC_ENV_TO_FACET_VER.put( "1.3",JavaFacet.VERSION_1_3 ); //$NON-NLS-1$ + EXEC_ENV_TO_FACET_VER.put( "1.4",JavaFacet.VERSION_1_4 ); //$NON-NLS-1$ + EXEC_ENV_TO_FACET_VER.put( "1.5",JavaFacet.VERSION_1_5 ); //$NON-NLS-1$ + EXEC_ENV_TO_FACET_VER.put( "1.6",JavaFacet.VERSION_1_6 ); //$NON-NLS-1$ + EXEC_ENV_TO_FACET_VER.put( "1.7",JavaFacet.VERSION_1_7 ); //$NON-NLS-1$ + } + + protected IProjectFacetVersion getDefaultJavaVersion() { + IProjectFacetVersion val = EXEC_ENV_TO_FACET_VER.get(getCompilerLevel()); + return val == null ? JavaFacet.VERSION_1_5 : val; + } + + public static String getCompilerLevel() { + String level = JavaCore.getOption( JavaCore.COMPILER_COMPLIANCE ); + if( level == null ) + level = (String) JavaCore.getDefaultOptions().get( JavaCore.COMPILER_COMPLIANCE ); + return level; + } }