[jbosstools-commits] JBoss Tools SVN: r15516 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/preferences and 1 other directory.
Author: akazakov
Date: 2009-05-26 12:14:07 -0400 (Tue, 26 May 2009)
New Revision: 15516
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2009-05-26 16:10:23
UTC (rev 15515)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2009-05-26 16:14:07
UTC (rev 15516)
@@ -59,7 +59,9 @@
org.eclipse.jst.jsf.core,
org.eclipse.ltk.core.refactoring;bundle-version="3.4.0",
org.eclipse.ltk.ui.refactoring;bundle-version="3.4.0",
- org.jboss.ide.eclipse.as.core;bundle-version="1.0.0"
+ org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
+ org.jboss.tools.jst.web.kb;bundle-version="1.0.0",
+ org.jboss.tools.jsf;bundle-version="2.0.0"
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.seam.ui,
org.jboss.tools.seam.ui.actions,
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 2009-05-26
16:10:23 UTC (rev 15515)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2009-05-26
16:14:07 UTC (rev 15516)
@@ -57,6 +57,8 @@
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.jsf.project.JSFNature;
+import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamProjectsSet;
@@ -947,8 +949,10 @@
private void removeSeamSupport() {
try {
- EclipseResourceUtil.removeNatureFromProject(project,
- ISeamProject.NATURE_ID);
+ EclipseResourceUtil.removeNatureFromProject(project, ISeamProject.NATURE_ID);
+ if(!project.hasNature(JSFNature.NATURE_ID)) {
+ EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ }
} catch (CoreException e) {
SeamGuiPlugin.getPluginLog().logError(e);
}
@@ -960,6 +964,9 @@
}
try {
EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ if(!project.hasNature(IKbProject.NATURE_ID)) {
+ EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ }
} catch (CoreException e) {
SeamGuiPlugin.getPluginLog().logError(e);
}