Author: rob.stryker(a)jboss.com Date: 2009-07-21 15:39:37 -0400 (Tue, 21 Jul 2009) New Revision: 16711 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java Log: better handling for projects that are faceted but not modulecore Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-21 19:21:40 UTC (rev 16710) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-21 19:39:37 UTC (rev 16711) @@ -211,12 +211,12 @@ } protected void createTable(Composite parent) { - availableComponentsViewer = createAvailableComponentsViewer(parent); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL - | GridData.FILL_VERTICAL); - availableComponentsViewer.getTable().setLayoutData(gd); + if (rootComponent != null) { + availableComponentsViewer = createAvailableComponentsViewer(parent); + GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL + | GridData.FILL_VERTICAL); + availableComponentsViewer.getTable().setLayoutData(gd); - if (rootComponent != null) { ComponentDependencyContentProvider provider = createProvider(); provider.setRuntimePaths(objectToRuntimePath); availableComponentsViewer.setContentProvider(provider); @@ -540,8 +540,8 @@ if (availableComponentsViewer != null) { table = availableComponentsViewer.getTable(); } - if (table == null) - return; + if (table == null || tableListener == null) + return; table.removeListener(SWT.Dispose, tableListener); table.removeListener(SWT.KeyDown, tableListener); table.removeListener(SWT.MouseMove, tableListener); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java 2009-07-21 19:21:40 UTC (rev 16710) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java 2009-07-21 19:39:37 UTC (rev 16711) @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.PropertyPage; +import org.eclipse.wst.common.componentcore.ComponentCore; 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.override.ui.Messages; @@ -61,7 +62,14 @@ setValid(false); return getErrorComposite(parent, errorCheckingFacet); } + private Composite getVirtCompErrorComposite(final Composite parent) { + final String errorCheckingFacet = "The given project is not a virtual component project"; + setErrorMessage(errorCheckingFacet); + setValid(false); + return getErrorComposite(parent, errorCheckingFacet); + } + private Composite getErrorComposite(final Composite parent, final String error) { final Composite composite = new Composite(parent, SWT.NONE); final GridLayout layout = new GridLayout(); @@ -170,6 +178,10 @@ controls = provider.createPages(facetedProject, this); return provider.createRootControl(controls, parent); } + + if( ComponentCore.createComponent(project) == null ) + return getVirtCompErrorComposite(parent); + AddModuleDependenciesPropertiesPage page = new AddModuleDependenciesPropertiesPage(project, this); controls = new IModuleDependenciesControl[1]; controls[0] = page;