X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fprofile%2FDynamicVisualisationsRequest.java;h=0387029ffdf98fefaabce12d2fc4e4c6b86e6a99;hb=refs%2Fchanges%2F81%2F3881%2F2;hp=3c187a10db8045b3b2c996b523f0826cb052c77b;hpb=fb4e5f02481e918807be83e87239a4d91b4343f2;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java b/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java
index 3c187a10..0387029f 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java
@@ -9,7 +9,9 @@ import org.simantics.db.Resource;
 import org.simantics.db.common.NamedResource;
 import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.district.network.DistrictNetworkUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.district.network.visualisations.DynamicVisualisations;
 import org.simantics.layer0.Layer0;
 
 /**
@@ -17,19 +19,22 @@ import org.simantics.layer0.Layer0;
  */
 public class DynamicVisualisationsRequest extends ResourceRead<Collection<NamedResource>> {
 
-    public DynamicVisualisationsRequest(Resource diagram) {
-        super(diagram);
+    public DynamicVisualisationsRequest(Resource parent) {
+        super(parent);
     }
 
     @Override
     public Collection<NamedResource> perform(ReadGraph graph) throws DatabaseException {
         DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-        Collection<Resource> visualisationResources = graph.getObjects(resource, DN.Diagram_hasVisualisation);
         List<NamedResource> results = new ArrayList<>();
-        if (visualisationResources != null && !visualisationResources.isEmpty()) {
-            for (Resource visualisationResource : visualisationResources) {
-                String name = graph.getRelatedValue(visualisationResource, Layer0.getInstance(graph).HasName);
-                results.add(new NamedResource(name, visualisationResource));
+        Resource visualisationFolder = DynamicVisualisations.getVisualisationFolder(graph, resource);
+        if (visualisationFolder != null) {
+            Collection<Resource> visualisationResources = graph.getObjects(visualisationFolder, DN.Diagram_hasVisualisation);
+            if (visualisationResources != null && !visualisationResources.isEmpty()) {
+                for (Resource visualisationResource : visualisationResources) {
+                    String name = graph.getRelatedValue(visualisationResource, Layer0.getInstance(graph).HasName);
+                    results.add(new NamedResource(name, visualisationResource));
+                }
             }
         }
         return results;