From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 20 Nov 2019 11:50:45 +0000 (+0200)
Subject: Fixed DynamicVisualisationContributionsParticipant to cancel hover task
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F3577%2F1;p=simantics%2Fdistrict.git

Fixed DynamicVisualisationContributionsParticipant to cancel hover task

Previously a possible hover info update task was never cancelled
properly if the participant was removed from the context due to e.g.
disposal of the diagram editor.

gitlab #67

Change-Id: I0d98673190ddbf836d40713f9c0b9c8608076552
(cherry picked from commit f97150acbd65924d45b7ab545d3398a8b070e2b5)
---

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DynamicVisualisationContributionsParticipant.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DynamicVisualisationContributionsParticipant.java
index 0e0bace9..7dd11b7a 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DynamicVisualisationContributionsParticipant.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DynamicVisualisationContributionsParticipant.java
@@ -75,6 +75,11 @@ public class DynamicVisualisationContributionsParticipant extends AbstractCanvas
     
     @Override
     public void removedFromContext(ICanvasContext ctx) {
+        // Ensure hover polling is stopped
+        if (hoverUpdateSchedule != null && !hoverUpdateSchedule.isDone()) {
+            hoverUpdateSchedule.cancel(false);
+        }
+
         getHintStack().removeKeyHintListener(getThread(), DistrictDiagramViewer.KEY_MAP_COLORING_OBJECTS, hintListener);
         getHintStack().removeKeyHintListener(getThread(), DistrictDiagramViewer.KEY_MAP_COLOR_BAR_OPTIONS, hintListener);
         getHintStack().removeKeyHintListener(getThread(), DistrictDiagramViewer.KEY_MAP_SIZING_OBJECTS, hintListener);
@@ -145,6 +150,7 @@ public class DynamicVisualisationContributionsParticipant extends AbstractCanvas
     }
 
     private ScheduledFuture<?> hoverUpdateSchedule;
+    private static final Object COMPLETE = new Object();
     
     public void hoverNode(Resource runtimeDiagram, Resource mapElement, G2DParentNode hoveredNode) {
         IThreadWorkQueue thread = getThread();
@@ -168,8 +174,13 @@ public class DynamicVisualisationContributionsParticipant extends AbstractCanvas
                             public void run(ReadGraph graph) throws DatabaseException {
                                 boolean keyVariablesVertexHover = visualisation.isKeyVariablesVertexHover();
                                 boolean keyVariablesEdgesHover = visualisation.isKeyVariablesEdgesHover();
-                                
-                                Resource mapElementInstanceOf = graph.getSingleObject(mapElement, Layer0.getInstance(graph).InstanceOf);
+
+                                Resource mapElementInstanceOf = graph.getPossibleObject(mapElement, Layer0.getInstance(graph).InstanceOf);
+                                if (mapElementInstanceOf == null) {
+                                    future.complete(COMPLETE);
+                                    return;
+                                }
+
                                 DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
                                 
                                 boolean doHover = true;
@@ -195,10 +206,10 @@ public class DynamicVisualisationContributionsParticipant extends AbstractCanvas
                                         } else {
                                             hoverInfoNode.hover2(null);
                                         }
-                                        future.complete(new Object());
+                                        future.complete(COMPLETE);
                                     });
                                 } else {
-                                    future.complete(new Object());
+                                    future.complete(COMPLETE);
                                 }
                             }
                         });