From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 28 Sep 2018 06:19:02 +0000 (+0300)
Subject: Fixed synchronousness problem in drag event transferable handling
X-Git-Tag: v1.43.0~136^2~353
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=96ae58fda842dcd8266192eeb1399324b092154a;ds=sidebyside

Fixed synchronousness problem in drag event transferable handling

Previously handleEvent would post the event for asynchronous handling
while handling the drag starting via Transferable requires the drag to
be started synchronously within the AWT drag start event handler.

Added syncHandleEvent to AbstractEventHandler to support this.

gitlab #112

Change-Id: I694844fbfc1be74b9f6b620afc8fc441a0ab4d31
---

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
index 43653cbd0..0b33ae3c4 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
@@ -62,7 +62,6 @@ import org.simantics.scenegraph.g2d.events.MouseEvent.MouseClickEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseDoubleClickedEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseDragBegin;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent;
-import org.simantics.scenegraph.g2d.events.NodeEventHandler;
 import org.simantics.scenegraph.g2d.events.command.CommandEvent;
 import org.simantics.scenegraph.g2d.events.command.Commands;
 import org.simantics.scenegraph.utils.GeometryUtils;
diff --git a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AWTMouseEventAdapter.java b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AWTMouseEventAdapter.java
index e01876c6d..d5b2aac41 100644
--- a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AWTMouseEventAdapter.java
+++ b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AWTMouseEventAdapter.java
@@ -317,7 +317,7 @@ public class AWTMouseEventAdapter extends AbstractEventAdapter implements MouseL
                             controlPos,
                             getScreenPosition(e));
 
-                    handleEvent(event);
+                    syncHandleEvent(event);
 
                     if (event.transferable != null) {
                         ds.startDrag(dge, null, event.transferable, null);
diff --git a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AbstractEventAdapter.java b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AbstractEventAdapter.java
index ef7184568..a0e0fd47f 100644
--- a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AbstractEventAdapter.java
+++ b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/events/adapter/AbstractEventAdapter.java
@@ -53,4 +53,13 @@ public abstract class AbstractEventAdapter {
             delegator.handleEvent(e);
     }
 
+    protected void syncHandleEvent(Event e) {
+        if (queue instanceof IEventHandler)
+            ((IEventHandler) queue).handleEvent(e);
+        else if (delegator != null && EventTypes.passes(delegator, e))
+            delegator.handleEvent(e);
+        else
+            throw new UnsupportedOperationException("Cannot handle event synchronously, no handler available: " + e);
+    }
+
 }