Ensure that deletion hook is only run on valid parents

There's now a "deletion hook" for ViewRules where they get a chance to
clean up after a set of children have been deleted. This changeset
guards against the case where the parent reference was null.

Change-Id: I3eef328ec5450a15588b29fff1d0d834388c4cde

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java
index 2c91b74..d431653 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java
@@ -210,12 +210,14 @@ public class ClipboardSupport {
                 for (SelectionItem cs : selection) {
                     NodeProxy node = cs.getNode();
                     INode parent = node.getParent();
-                    List<INode> children = clusters.get(parent);
-                    if (children == null) {
-                        children = new ArrayList<INode>();
-                        clusters.put((NodeProxy) parent, children);
+                    if (parent != null) {
+                        List<INode> children = clusters.get(parent);
+                        if (children == null) {
+                            children = new ArrayList<INode>();
+                            clusters.put((NodeProxy) parent, children);
+                        }
+                        children.add(node);
                     }
-                    children.add(node);
                 }
 
                 // Notify parent views about children getting deleted