Author: rob.stryker(a)jboss.com Date: 2010-01-22 04:48:28 -0500 (Fri, 22 Jan 2010) New Revision: 19876 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/impl/JEEModuleDependenciesPropertyPage.java Log: JBIDE-5713 - fixed with a small API over-ride 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-22 09:35:46 UTC (rev 19875) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2010-01-22 09:48:28 UTC (rev 19876) @@ -594,8 +594,12 @@ buttonColumn.setLayoutData(btndata); } + protected IVirtualReference[] getHardReferencesFromComponent(IVirtualComponent component) { + return component.getReferences(); + } + protected void initialize() { - IVirtualReference[] refs = rootComponent.getReferences(); + IVirtualReference[] refs = getHardReferencesFromComponent(rootComponent); IVirtualComponent comp; for( int i = 0; i < refs.length; i++ ) { comp = refs[i].getReferencedComponent(); Modified: 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/JEEModuleDependenciesPropertyPage.java 2010-01-22 09:35:46 UTC (rev 19875) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java 2010-01-22 09:48:28 UTC (rev 19876) @@ -6,10 +6,12 @@ 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.componentcore.J2EEModuleVirtualComponent; 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.componentcore.resources.IVirtualReference; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; @@ -26,6 +28,13 @@ super(project, page); } + protected IVirtualReference[] getHardReferencesFromComponent(IVirtualComponent component) { + if( component instanceof J2EEModuleVirtualComponent ) { + return ((J2EEModuleVirtualComponent)component).getNonManifestReferences(false); + } + return component.getReferences(); + } + protected ReferenceExtension[] getReferenceExtensions() { ReferenceExtension[] parents = super.getReferenceExtensions(); ArrayList<ReferenceExtension> l = new ArrayList<ReferenceExtension>();