Author: rob.stryker(a)jboss.com Date: 2010-01-12 14:19:44 -0500 (Tue, 12 Jan 2010) New Revision: 19716 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java Log: JBIDE-5510 - hiding jbt reference types from wtp assembly pages Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2010-01-12 16:36:45 UTC (rev 19715) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2010-01-12 19:19:44 UTC (rev 19716) @@ -26,8 +26,8 @@ <extension point="org.jboss.ide.eclipse.as.wtp.ui.moduleDependencyPropertyPage"> <dependencyPage - class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl.EarModuleDependencyPageProvider" - id="org.jboss.ide.eclipse.as.wtp.ui.earDependencyPage"> + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl.JEEModuleDependencyPageProvider" + id="org.jboss.ide.eclipse.as.wtp.ui.jeeDependencyPage"> </dependencyPage> </extension> <extension Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2010-01-12 16:36:45 UTC (rev 19715) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2010-01-12 19:19:44 UTC (rev 19716) @@ -85,6 +85,7 @@ import org.eclipse.wst.server.ui.wizard.WizardFragment; import org.jboss.ide.eclipse.as.wtp.ui.Messages; import org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension; public class AddModuleDependenciesPropertiesPage implements Listener, IModuleDependenciesControl, ILabelProviderListener { @@ -466,9 +467,13 @@ showReferenceWizard(true); } + protected ReferenceExtension[] getReferenceExtensions() { + return DependencyPageExtensionManager.getManager().getReferenceExtensions(); + } + protected void showReferenceWizard(boolean editing) { - NewReferenceWizard wizard = new NewReferenceWizard(); + NewReferenceWizard wizard = new NewReferenceWizard(getReferenceExtensions()); // fill the task model wizard.getTaskModel().putObject(NewReferenceWizard.PROJECT, project); wizard.getTaskModel().putObject(NewReferenceWizard.ROOT_COMPONENT, rootComponent); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java 2010-01-12 16:36:45 UTC (rev 19715) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java 2010-01-12 19:19:44 UTC (rev 19716) @@ -26,6 +26,13 @@ new HashMap<String, WizardFragment>(); private IWizardHandle wizard; private TreeViewer viewer; + private ReferenceExtension[] extensions = null; + public NewReferenceRootWizardFragment(ReferenceExtension[] extensions) { + if( extensions == null ) + this.extensions = DependencyPageExtensionManager.getManager().getReferenceExtensions(); + else + this.extensions = extensions; + } public boolean hasComposite() { return true; } @@ -119,13 +126,10 @@ return labelProvider; } - private ReferenceExtension[] extensions = null; protected ITreeContentProvider getContentProvider() { if( contentProvider == null ) { contentProvider = new ITreeContentProvider() { public Object[] getElements(Object inputElement) { - if( extensions == null ) - extensions = DependencyPageExtensionManager.getManager().getReferenceExtensions(); return extensions; } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java 2010-01-12 16:36:45 UTC (rev 19715) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java 2010-01-12 19:19:44 UTC (rev 19716) @@ -7,6 +7,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.server.ui.internal.wizard.TaskWizard; import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension; public class NewReferenceWizard extends TaskWizard { @@ -17,16 +18,20 @@ public static final String DEPENDENCY_TYPE = "dependency.type"; - public NewReferenceWizard() { - super("New Reference Wizard", new RootWizardFragment()); + public NewReferenceWizard(ReferenceExtension[] extensions) { + super("New Reference Wizard", new RootWizardFragment(extensions)); getRootFragment().setTaskModel(getTaskModel()); } protected static class RootWizardFragment extends WizardFragment { + private ReferenceExtension[] extensions; + public RootWizardFragment(ReferenceExtension[] extensions) { + this.extensions = extensions; + } protected void createChildFragments(List<WizardFragment> list) { IVirtualComponent component = (IVirtualComponent)getTaskModel().getObject(COMPONENT); if( component == null ) - list.add(new NewReferenceRootWizardFragment()); + list.add(new NewReferenceRootWizardFragment(extensions)); else { WizardFragment fragment = getFirstEditingFragment(component); if( fragment != null ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2010-01-12 16:36:45 UTC (rev 19715) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2010-01-12 19:19:44 UTC (rev 19716) @@ -1,54 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl; - -import java.util.ArrayList; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider; -import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider; -import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; -import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider; -import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.AddModuleDependenciesPropertiesPage; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage; - -public class EarModuleDependenciesPropertyPage extends - AddModuleDependenciesPropertiesPage { - public EarModuleDependenciesPropertyPage(IProject project, - ModuleAssemblyRootPage page) { - super(project, page); - } - - protected IDataModelOperation generateEARDDOperation() { - IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider()); - model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, rootComponent); - model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project); - return model.getDefaultOperation(); - } - - public boolean postHandleChanges(IProgressMonitor monitor) { - return true; - } - - protected void handleRemoved(ArrayList<IVirtualComponent> removed) { - super.handleRemoved(removed); - J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject()); - } - - protected IDataModelProvider getRemoveReferenceDataModelProvider(Object component) { - return new RemoveComponentFromEnterpriseApplicationDataModelProvider(); - } - -// protected void postAddProjects(Set moduleProjects) throws CoreException { -// EarFacetRuntimeHandler.updateModuleProjectRuntime(rootComponent.getProject(), moduleProjects, new NullProgressMonitor()); -// } - - protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) { - return new OverrideAddComponentToEnterpriseApplicationDataModelProvider(); - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2010-01-12 16:36:45 UTC (rev 19715) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2010-01-12 19:19:44 UTC (rev 19716) @@ -1,30 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl; - -import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IDependencyPageProvider; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IModuleDependenciesControl; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage; - -public class EarModuleDependencyPageProvider implements IDependencyPageProvider { - - public boolean canHandle(IFacetedProject project) { - boolean isEAR = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.ear")); //$NON-NLS-1$ - return isEAR; - } - - public IModuleDependenciesControl[] createPages(IFacetedProject project, - ModuleAssemblyRootPage parent) { - return new IModuleDependenciesControl[] { - new EarModuleDependenciesPropertyPage(project.getProject(), parent) - }; - } - - public Composite createRootControl(IModuleDependenciesControl[] pages, - Composite parent) { - if( pages.length == 1 && pages[0] != null) - return pages[0].createContents(parent); - return null; - } -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java (from rev 19456, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java 2010-01-12 19:19:44 UTC (rev 19716) @@ -0,0 +1,86 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl; + +import java.util.ArrayList; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider; +import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider; +import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; +import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider; +import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.AddModuleDependenciesPropertiesPage; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension; + +public class JEEModuleDependenciesPropertyPage extends + AddModuleDependenciesPropertiesPage { + public JEEModuleDependenciesPropertyPage(IProject project, + ModuleAssemblyRootPage page) { + super(project, page); + } + + protected ReferenceExtension[] getReferenceExtensions() { + ReferenceExtension[] parents = super.getReferenceExtensions(); + ArrayList<ReferenceExtension> l = new ArrayList<ReferenceExtension>(); + for( int i = 0; i < parents.length; i++ ) + if( shouldAddReferenceType(parents[i])) + l.add(parents[i]); + return (ReferenceExtension[]) l.toArray(new ReferenceExtension[l.size()]); + } + + protected boolean shouldAddReferenceType(ReferenceExtension extension) { + // approved types + String NEW_PROJ = "org.jboss.ide.eclipse.as.wtp.ui.newProjectReference"; + String JAR = "org.jboss.ide.eclipse.as.wtp.ui.jarReference"; + String EXT_JAR = "org.jboss.ide.eclipse.as.wtp.ui.externalJarReference"; + String VAR = "org.jboss.ide.eclipse.as.wtp.ui.variableReference"; + String id = extension.getId(); + if( id.equals(NEW_PROJ) || id.equals(JAR) || id.equals(EXT_JAR) || id.equals(VAR) ) + return true; + return false; + } + + protected IDataModelOperation generateEARDDOperation() { + IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider()); + model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, rootComponent); + model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project); + return model.getDefaultOperation(); + } + + public boolean postHandleChanges(IProgressMonitor monitor) { + return true; + } + + protected void handleRemoved(ArrayList<IVirtualComponent> removed) { + super.handleRemoved(removed); + if( isEar()) + J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject()); + } + + protected IDataModelProvider getRemoveReferenceDataModelProvider(IVirtualComponent component) { + if( isEar() ) + return new RemoveComponentFromEnterpriseApplicationDataModelProvider(); + return super.getRemoveReferenceDataModelProvider(component); + } + +// protected void postAddProjects(Set moduleProjects) throws CoreException { +// EarFacetRuntimeHandler.updateModuleProjectRuntime(rootComponent.getProject(), moduleProjects, new NullProgressMonitor()); +// } + + protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) { + if( isEar() ) + return new OverrideAddComponentToEnterpriseApplicationDataModelProvider(); + return super.getAddReferenceDataModelProvider(component); + } + + protected boolean isEar() { + return false; + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java (from rev 18927, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java 2010-01-12 19:19:44 UTC (rev 19716) @@ -0,0 +1,31 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl; + +import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IDependencyPageProvider; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IModuleDependenciesControl; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage; + +public class JEEModuleDependencyPageProvider implements IDependencyPageProvider { + + public boolean canHandle(IFacetedProject project) { + return J2EEProjectUtilities.isJEEProject(project.getProject()) + || J2EEProjectUtilities.isLegacyJ2EEProject(project.getProject()); + } + + public IModuleDependenciesControl[] createPages(IFacetedProject project, + ModuleAssemblyRootPage parent) { + return new IModuleDependenciesControl[] { + new JEEModuleDependenciesPropertyPage(project.getProject(), parent) + }; + } + + public Composite createRootControl(IModuleDependenciesControl[] pages, + Composite parent) { + if( pages.length == 1 && pages[0] != null) + return pages[0].createContents(parent); + return null; + } +}