[109441] Use base selection notification instead of ViewerSelectionManager
make sure that no null values are in the list of active CMDocumentManagers
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/views/properties/XMLPropertySheetConfiguration.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/views/properties/XMLPropertySheetConfiguration.java
index 3af0b0a..2deaf42 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/views/properties/XMLPropertySheetConfiguration.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/views/properties/XMLPropertySheetConfiguration.java
@@ -148,9 +148,12 @@
// replace Attribute Node with its owner
if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
inputList.set(i, ((Attr) node).getOwnerElement());
- ModelQuery q = ModelQueryUtil.getModelQuery(((Attr) node).getOwnerElement().getOwnerDocument());
- if (q != null) {
- managers.add(q.getCMDocumentManager());
+ ModelQuery query = ModelQueryUtil.getModelQuery(((Attr) node).getOwnerElement().getOwnerDocument());
+ if (query != null) {
+ Object o = query.getCMDocumentManager();
+ if (o != null) {
+ managers.add(o);
+ }
}
}
// replace Text Node with its parent
@@ -158,7 +161,10 @@
inputList.set(i, node.getParentNode());
ModelQuery query = ModelQueryUtil.getModelQuery(node.getParentNode().getOwnerDocument());
if (query != null) {
- managers.add(query.getCMDocumentManager());
+ Object o = query.getCMDocumentManager();
+ if (o != null) {
+ managers.add(o);
+ }
}
}
}