X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDistrictDiagramViewer.java;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDistrictDiagramViewer.java;h=ffa48d36bee6c0e351ccc632fbec1a9b29f06af2;hb=26ace6ab51bc85e8c7429b84a0402e70b49fc062;hp=f0305fad2ce9ca663a10feab158abf90d2bb5b87;hpb=0f871d5a2e1a0a531195ef80f007af89de62c914;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java
index f0305fad..ffa48d36 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java
@@ -182,30 +182,38 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
     
     private void queueColoringObjectsChangeEvent(Map<String, DynamicColorContribution> result) {
-        if (result != null) {
+        if (result != null && !canvasContext.isDisposed()) {
             canvasContext.getDefaultHintContext().setHint(KEY_MAP_COLORING_OBJECTS, result);
             canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_COLORING_OBJECTS_CHANGE));
+        } else {
+            LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
         }
     }
     
     private void queueColorBarOptionsChangeEvent(ColorBarOptions result) {
-        if (result != null) {
+        if (result != null && !canvasContext.isDisposed()) {
             canvasContext.getDefaultHintContext().setHint(KEY_MAP_COLOR_BAR_OPTIONS, result);
             canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_COLOR_BAR_OPTIONS_CHANGE));
+        } else {
+            LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
         }
     }
 
     private void queueSizingObjectsChangeEvent(Map<String, DynamicSizeContribution> result) {
-        if (result != null) {
+        if (result != null && !canvasContext.isDisposed()) {
             canvasContext.getDefaultHintContext().setHint(KEY_MAP_SIZING_OBJECTS, result);
             canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_SIZING_OBJECTS_CHANGE));
+        } else {
+            LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
         }
     }
     
     private void queueSizeBarOptionsChangeEvent(SizeBarOptions result) {
-        if (result != null) {
+        if (result != null && !canvasContext.isDisposed()) {
             canvasContext.getDefaultHintContext().setHint(KEY_MAP_SIZE_BAR_OPTIONS, result);
             canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_SIZE_BAR_OPTIONS_CHANGE));
+        } else {
+            LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
         }
     }