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;h=7ee2f2faa03a2c5b771e7d52de2d05db1a21f034;hb=8ed34578950dcf8e59f85e3ceecf0f8f264f6208;hp=d7f530dfd025e8df8ff49a8e5077841ac4ceeec1;hpb=b6f289e20a2105cedbe103723de93d1116654ee2;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 d7f530df..7ee2f2fa 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
@@ -309,9 +309,13 @@ public class DistrictDiagramViewer extends DiagramViewer {
             DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
             Resource model = graph.syncRequest(new IndexRoot(parameter));
             Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
-            Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
-            if (activeVisualisation != null) {
-                return DistrictNetworkUtil.colorBarOptions(graph, activeVisualisation);
+            if (vf != null) {
+                Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+                if (activeVisualisation != null) {
+                    return DistrictNetworkUtil.colorBarOptions(graph, activeVisualisation);
+                }
+            } else {
+                LOGGER.debug("No visualisation folder available for model {}", model);
             }
             return ColorBarOptions.useDefault();
         }
@@ -328,9 +332,13 @@ public class DistrictDiagramViewer extends DiagramViewer {
             DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
             Resource model = graph.syncRequest(new IndexRoot(parameter));
             Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
-            Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
-            if (activeVisualisation != null) {
-                return DistrictNetworkUtil.colorContributions(graph, activeVisualisation);
+            if (vf != null) {
+                Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+                if (activeVisualisation != null) {
+                    return DistrictNetworkUtil.colorContributions(graph, activeVisualisation);
+                }
+            } else {
+                LOGGER.debug("No visualisation folder available for model {}", model);
             }
             return Collections.emptyMap();
         }
@@ -403,9 +411,13 @@ public class DistrictDiagramViewer extends DiagramViewer {
             DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
             Resource model = graph.syncRequest(new IndexRoot(parameter));
             Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
-            Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
-            if (activeVisualisation != null) {
-                return DistrictNetworkUtil.sizeBarOptions(graph, activeVisualisation);
+            if (vf != null) {
+                Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+                if (activeVisualisation != null) {
+                    return DistrictNetworkUtil.sizeBarOptions(graph, activeVisualisation);
+                }
+            } else {
+                LOGGER.debug("No visualisation folder available for model {}", model);
             }
             return SizeBarOptions.useDefault();
         }
@@ -450,9 +462,13 @@ public class DistrictDiagramViewer extends DiagramViewer {
             DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
             Resource model = graph.syncRequest(new IndexRoot(parameter));
             Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
-            Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
-            if (activeVisualisation != null) {
-                return DistrictNetworkUtil.sizeContributions(graph, activeVisualisation);
+            if (vf != null) {
+                Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+                if (activeVisualisation != null) {
+                    return DistrictNetworkUtil.sizeContributions(graph, activeVisualisation);
+                }
+            } else {
+                LOGGER.debug("No visualisation folder available for model {}", model);
             }
             return Collections.emptyMap();
         }