From 33e85fb4f5b05f32c00187a6779e2a53f2665850 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 18 Oct 2010 20:50:33 +0400
Subject: [PATCH] EA-22481 - NPE: DesignDropTargetListener.dragOver

---
 .../designSurface/DesignDropTargetListener.java           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java
index 648fe8605438..058961f120ce 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java
@@ -152,11 +152,15 @@ class DesignDropTargetListener implements DropTargetListener {
       ComponentDropLocation location = myGridInsertProcessor.processDragEvent(dtde.getLocation(), myComponentDragObject);
       if (!location.canDrop(myComponentDragObject) ||
           (myDraggedComponentList != null && FormEditingUtil.isDropOnChild(myDraggedComponentList, location))) {
-        myComponentTree.setDropTargetComponent(null);
+        if (myComponentTree != null) {
+          myComponentTree.setDropTargetComponent(null);
+        }
         dtde.rejectDrag();
       }
       else {
-        myComponentTree.setDropTargetComponent(location.getContainer());
+        if (myComponentTree != null) {
+          myComponentTree.setDropTargetComponent(location.getContainer());
+        }
         dtde.acceptDrag(dtde.getDropAction());
       }
     }