Author: akazakov Date: 2008-04-01 12:35:13 -0400 (Tue, 01 Apr 2008) New Revision: 7252 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-1318 Moved add/remove jsf variable resolver actions to Seam Nature Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-04-01 15:44:31 UTC (rev 7251) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-04-01 16:35:13 UTC (rev 7252) @@ -35,6 +35,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; +import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; import org.jboss.tools.common.xml.XMLUtilities; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentDeclaration; @@ -53,6 +54,7 @@ import org.jboss.tools.seam.core.event.SeamProjectChangeEvent; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; +import org.jboss.tools.seam.internal.core.el.VariableResolver; import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations; import org.jboss.tools.seam.internal.core.scanner.lib.ClassPath; import org.jboss.tools.seam.internal.core.validation.SeamValidationContext; @@ -91,13 +93,13 @@ { createScopes(); } - + ComponentStorage components = new ComponentStorage(); FactoryStorage factories = new FactoryStorage(); VariablesStorage variables = new VariablesStorage(); - + Map<String, ISeamPackage> packages = new HashMap<String, ISeamPackage>(); - + List<ISeamProjectChangeListener> listeners = new ArrayList<ISeamProjectChangeListener>(); SeamValidationContext validationContext; @@ -112,6 +114,7 @@ */ public void configure() throws CoreException { addToBuildSpec(SeamCoreBuilder.BUILDER_ID); + DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID); } /** @@ -119,6 +122,7 @@ */ public void deconfigure() throws CoreException { removeFromBuildSpec(SeamCoreBuilder.BUILDER_ID); + DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(null); } /** Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-04-01 15:44:31 UTC (rev 7251) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-04-01 16:35:13 UTC (rev 7252) @@ -35,7 +35,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; -import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; @@ -49,7 +48,6 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; -import org.jboss.tools.seam.internal.core.el.VariableResolver; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; @@ -492,7 +490,6 @@ createSeamProjectPreferenes(project, model); EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID); - DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID); toggleHibernateOnProject(project, consoleName); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-04-01 15:44:31 UTC (rev 7251) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-04-01 16:35:13 UTC (rev 7252) @@ -33,7 +33,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; -import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; @@ -47,7 +46,6 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; -import org.jboss.tools.seam.internal.core.el.VariableResolver; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; @@ -542,7 +540,6 @@ createSeamProjectPreferenes(project, model); EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID); - DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID); toggleHibernateOnProject(project, consoleName); 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-01 15:44:31 UTC (rev 7251) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-04-01 16:35:13 UTC (rev 7252) @@ -39,7 +39,6 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; import org.eclipse.jface.dialogs.IMessageProvider; -import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -56,7 +55,6 @@ 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.el.VariableResolver; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.ui.SeamGuiPlugin; import org.jboss.tools.seam.ui.SeamUIMessages; @@ -731,7 +729,6 @@ try { EclipseResourceUtil.removeNatureFromProject(project, ISeamProject.NATURE_ID); - DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(null); } catch (CoreException e) { SeamGuiPlugin.getPluginLog().logError(e); } @@ -740,7 +737,6 @@ private void addSeamSupport() { try { EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID); - DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID); } catch (CoreException e) { SeamGuiPlugin.getPluginLog().logError(e); } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-04-01 15:44:31 UTC (rev 7251) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-04-01 16:35:13 UTC (rev 7252) @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentMethod; import org.jboss.tools.seam.core.ISeamProject; @@ -31,7 +30,6 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamPreferences; import org.jboss.tools.seam.internal.core.SeamProject; -import org.jboss.tools.seam.internal.core.el.VariableResolver; import org.jboss.tools.seam.internal.core.validation.SeamRuntimeValidation; import org.jboss.tools.test.util.JUnitUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -56,7 +54,6 @@ project = setup.importProject(); } this.project = project.getProject(); - DesignTimeApplicationManager.getInstance(this.project).setVariableResolverProvider(VariableResolver.ID); this.project.build(IncrementalProjectBuilder.FULL_BUILD, null); EditorTestHelper.joinBackgroundActivities(); }