[394416] Referenced component cannot be removed when the file was
removed
diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index f11d78f..c65d8e0 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -21,6 +21,7 @@
<p>Bug <a href='https://bugs.eclipse.org/373563'>373563</a>. Do not use fragments when resolving URI from component in MappedComponentXMIHelper</p>
<p>Bug <a href='https://bugs.eclipse.org/369587'>369587</a>. V2 Validation Framework ignoring IResourceDelta.REMOVED events</p>
<p>Bug <a href='https://bugs.eclipse.org/376747'>376747</a>. Source files not included in WEB-INF/classes when exporting a WAR if .component file contains non-existing folders</p>
+ <p>Bug <a href='https://bugs.eclipse.org/394416'>394416</a>. Referenced component cannot be removed when the file was removed</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index dfaedf1..68a4e6a 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -35,6 +35,7 @@
Bug https://bugs.eclipse.org/373563 Do not use fragments when resolving URI from component in MappedComponentXMIHelper\n\
Bug https://bugs.eclipse.org/369587 V2 Validation Framework ignoring IResourceDelta.REMOVED events\n\
Bug https://bugs.eclipse.org/376747 Source files not included in WEB-INF/classes when exporting a WAR if .component file contains non-existing folders\n\
+Bug https://bugs.eclipse.org/394416 Referenced component cannot be removed when the file was removed\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
index d3c317d..03a35da 100644
--- a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name.0
Bundle-Vendor: %provider
Bundle-SymbolicName: org.eclipse.wst.common.modulecore; singleton:=true
-Bundle-Version: 1.2.8.qualifier
+Bundle-Version: 1.2.9.qualifier
Bundle-Activator: org.eclipse.wst.common.componentcore.internal.ModulecorePlugin
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.common.componentcore,
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
index d0ed549..1e4d59c 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
@@ -11,7 +11,9 @@
package org.eclipse.wst.common.componentcore.internal.operation;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
@@ -50,7 +52,9 @@
IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
if (sourceComp == null || !sourceComp.getProject().isAccessible() || sourceComp.isBinary()) return;
- IVirtualReference [] existingReferencesArray = sourceComp.getReferences();
+ Map<String, Object> options = new HashMap<String, Object>();
+ options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.DISPLAYABLE_REFERENCES_ALL);
+ IVirtualReference [] existingReferencesArray = sourceComp.getReferences(options);
if(existingReferencesArray == null || existingReferencesArray.length == 0){
return;
}
