Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2014-05-13 16:57:51 -0400
committerTom Schindl2014-05-13 16:57:51 -0400
commit626aea9beb9757b01f2ae94da3f60b37ff3c152d (patch)
tree90b1d97ed588108374c1aac70ad79c5dfa4b1fe0
parent57cb68f7077cf891eaee00fa3a7404433e803829 (diff)
downloadorg.eclipse.efxclipse-626aea9beb9757b01f2ae94da3f60b37ff3c152d.tar.gz
org.eclipse.efxclipse-626aea9beb9757b01f2ae94da3f60b37ff3c152d.tar.xz
org.eclipse.efxclipse-626aea9beb9757b01f2ae94da3f60b37ff3c152d.zip
Bug 434803 - Upgrade to jdt.annotation 2.0
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/internal/DnDSupporter.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/internal/DnDSupporter.java b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/internal/DnDSupporter.java
index 1dcecf49f..870079e16 100644
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/internal/DnDSupporter.java
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/internal/DnDSupporter.java
@@ -138,6 +138,11 @@ public class DnDSupporter {
Tab tab = (Tab) field.get(referenceNode);
MStackElement reference = ((WStackItem<?, ?>)tab.getUserData()).getDomElement();
+ if( reference == null ) {
+ cleanup();
+ return;
+ }
+
boolean noMove = false;
if( reference == DRAG_DATA.item ) {
noMove = true;
@@ -209,6 +214,10 @@ public class DnDSupporter {
field.setAccessible(true);
Tab tab = (Tab) field.get(referenceNode);
MStackElement reference = ((WStackItem<?, ?>)tab.getUserData()).getDomElement();
+ if(reference == null) {
+ cleanup();
+ return;
+ }
boolean noMove = false;
if( reference == DRAG_DATA.item ) {
@@ -283,6 +292,9 @@ public class DnDSupporter {
WStackItem<?, ?> item = (org.eclipse.fx.ui.workbench.renderers.base.widget.WStack.WStackItem<?, ?>) t.getUserData();
MStackElement itemElement = item.getDomElement();
+ if( itemElement == null ) {
+ return;
+ }
MPartStack itemContainer = (MPartStack)(MUIElement)itemElement.getParent();
DragData dragData = new DragData(itemContainer, itemElement);
if( dragStartCallback.call(dragData).booleanValue() ) {

Back to the top