commit 6b22495d83d5bd0735236433de10d2087e1c4986
author kchong <kchong> Mon May 01 18:21:29 2006 +0000
committer kchong <kchong> Mon May 01 18:21:29 2006 +0000
tree 149c7fecad3eda91079a007f599139ab10770c0e
parent 0f05955668c7475eb15b7de8785a6fe48bf7c306

[137010] XSD Editor Throws NPE

bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java
index 4a7f319..be4764a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java
@@ -46,6 +46,7 @@
       XSDConcreteComponent concreteComponent = (XSDConcreteComponent) i.next();
       selectedNodes.add(concreteComponent.getElement());
     }
+    if (parentComponent == null) return;
     parentNode = parentComponent.getElement();
     nextRefChild = nextRefChildComponent != null ? nextRefChildComponent.getElement() : null;
     previousRefChild = previousRefChildComponent != null ? previousRefChildComponent.getElement() : null;
@@ -71,7 +72,7 @@
   {
     boolean result = true;
 
-    if (nextRefComponent instanceof XSDAttributeDeclaration || previousRefComponent instanceof XSDAttributeDeclaration)
+    if (nextRefComponent instanceof XSDAttributeDeclaration || previousRefComponent instanceof XSDAttributeDeclaration || parentModelGroup == null)
       return false;
 
     return result;