Author: rob.stryker(a)jboss.com Date: 2009-10-09 18:13:14 -0400 (Fri, 09 Oct 2009) New Revision: 18027 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java Log: JBIDE-4983 - consumed references in module assembly wizard 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 2009-10-09 21:59:05 UTC (rev 18026) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-10-09 22:13:14 UTC (rev 18027) @@ -871,8 +871,13 @@ protected void addOneComponent(IVirtualComponent component) throws CoreException { String path, archiveName; - path = new Path(objectToRuntimePath.get(component)).removeLastSegments(1).toString(); - archiveName = new Path(objectToRuntimePath.get(component)).lastSegment(); + path = archiveName = null; + if( !consumedReferences.contains(component)) { + path = new Path(objectToRuntimePath.get(component)).removeLastSegments(1).toString(); + archiveName = new Path(objectToRuntimePath.get(component)).lastSegment(); + } else { + path = objectToRuntimePath.get(component); + } IDataModelProvider provider = getAddReferenceDataModelProvider(component); IDataModel dm = DataModelFactory.createDataModel(provider); @@ -881,9 +886,11 @@ dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Arrays.asList(component)); //[Bug 238264] the uri map needs to be manually set correctly - Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>(); - uriMap.put(component, archiveName); - dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap); + if( archiveName != null ) { + Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>(); + uriMap.put(component, archiveName); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap); + } dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path); IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);