Author: akazakov Date: 2008-04-09 09:44:12 -0400 (Wed, 09 Apr 2008) New Revision: 7456 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java Log: http://jira.jboss.com/jira/browse/JBIDE-1995 Fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java 2008-04-09 13:38:16 UTC (rev 7455) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java 2008-04-09 13:44:12 UTC (rev 7456) @@ -66,4 +66,21 @@ "Seam version ''{0}'' is not supported", version)); //$NON-NLS-1$ //$NON-NLS-2$ } + /** + * Get enumeration by string + * If can't find any version then return null. + * + * @param version + * string representation of version + * @return + * version enumeration corresponding to version string + */ + public static SeamVersion findByString(String version) { + if (SEAM_1_2.toString().equals(version)) { + return SEAM_1_2; + } else if (SEAM_2_0.toString().equals(version)) { + return SEAM_2_0; + } + return null; + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2008-04-09 13:38:16 UTC (rev 7455) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2008-04-09 13:44:12 UTC (rev 7456) @@ -36,6 +36,8 @@ // Seam Preferences names constants + String SEAM_FACET_ID = "jst.seam"; + /** * Source folder used session objects: actions, forms, conversations, beans * web pages backing beans Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-04-09 13:38:16 UTC (rev 7455) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-04-09 13:44:12 UTC (rev 7456) @@ -48,12 +48,15 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.dialogs.PropertyPage; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +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.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamProjectsSet; import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; -import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; @@ -787,9 +790,20 @@ private SeamVersion[] getSeamVersions() { if(warSeamProject != null) { - SeamRuntime r = warSeamProject.getRuntime(); - if(r != null) { - return new SeamVersion[]{r.getVersion()}; + try { + IFacetedProject facetedProject = ProjectFacetsManager.create(warSeamProject.getProject()); + if(facetedProject!=null) { + IProjectFacet facet = ProjectFacetsManager.getProjectFacet(ISeamFacetDataModelProperties.SEAM_FACET_ID); + IProjectFacetVersion version = facetedProject.getInstalledVersion(facet); + if(version!=null) { + SeamVersion seamVersion = SeamVersion.findByString(version.getVersionString()); + if(seamVersion!=null) { + return new SeamVersion[]{seamVersion}; + } + } + } + } catch (CoreException e) { + SeamGuiPlugin.getPluginLog().logError(e); } String jarLocation = getJBossSeamJarLocation(); if(jarLocation != null) {