diff options
| author | Stefan Xenos | 2016-05-02 19:52:19 +0000 |
|---|---|---|
| committer | Stefan Xenos | 2016-05-02 19:53:50 +0000 |
| commit | 6ef2ad0aea0b7208066f047de8d2bcbefc65a5af (patch) | |
| tree | 478362ad52792046c20fdfbd2f74ab7394241d15 | |
| parent | 1622d97104c3f779e77a1b89db7b3565b3b6e80b (diff) | |
| download | eclipse.platform.ui-6ef2ad0aea0b7208066f047de8d2bcbefc65a5af.tar.gz eclipse.platform.ui-6ef2ad0aea0b7208066f047de8d2bcbefc65a5af.tar.xz eclipse.platform.ui-6ef2ad0aea0b7208066f047de8d2bcbefc65a5af.zip | |
Bug 447325 - [platform] NPE in DetachedDropAgent.drop
Access the drag rectangle by calling getRectangle rather than
relying on side-effects of previous calls.
Change-Id: Idc375e34d5e51b6a47579111499133e7d624f4fc
Signed-off-by: Stefan Xenos <sxenos@gmail.com>
| -rw-r--r-- | bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java index 9fcf7d4b94c..2dd83131b75 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java @@ -57,8 +57,10 @@ public class DetachedDropAgent extends DropAgent { if (dragElement.getCurSharedRef() != null) dragElement = dragElement.getCurSharedRef(); - modelService.detach((MPartSashContainerElement) dragElement, curRect.x, curRect.y, - curRect.width, curRect.height); + Rectangle rectangle = getRectangle(dragElement, info); + + modelService.detach((MPartSashContainerElement) dragElement, rectangle.x, rectangle.y, rectangle.width, + rectangle.height); // Fully re-activate the part since its location has changed reactivatePart(dragElement); |