[nobug] Fixing npe's
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 b592c90..9359e99 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
@@ -35,6 +35,7 @@
protected void removeProjectReferences() {
IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
+ if (!sourceComp.getProject().isAccessible()) return;
List modList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
List targetprojectList = new ArrayList();
for( int i=0; i< modList.size(); i++){
@@ -53,6 +54,7 @@
protected void removeReferencedComponents(IProgressMonitor monitor) {
IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
+ if (!sourceComp.getProject().isAccessible()) return;
//IVirtualComponent sourceComp = ComponentCore.createComponent(sourceProject);
List modList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
@@ -76,7 +78,7 @@
List refList = new ArrayList();
IVirtualReference[] refArray = component.getReferences();
for (int i = 0; i < refArray.length; i++) {
- if (!refArray[i].getReferencedComponent().equals(reference.getReferencedComponent()))
+ if (refArray[i].getReferencedComponent() != null && !refArray[i].getReferencedComponent().equals(reference.getReferencedComponent()))
refList.add(refArray[i]);
}
component.setReferences((IVirtualReference[]) refList.toArray(new IVirtualReference[refList.size()]));
