X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fadapters%2FDistrictNetworkEdgeElementFactory.java;h=63590990cd9ba421097cd65270be0b6cf8faaa4c;hb=16ee01dc5a40981c58fd5b478b89552e5814e8bb;hp=ff1d844faf936c93a5344db9804a768c85a29991;hpb=9dace20146d19dd0541480a80fd289de45b6cfc8;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElementFactory.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElementFactory.java
index ff1d844f..63590990 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElementFactory.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElementFactory.java
@@ -1,62 +1,75 @@
-package org.simantics.district.network.ui.adapters;
-
-import java.awt.geom.Path2D;
-
-import org.simantics.db.AsyncReadGraph;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.procedure.AsyncProcedure;
-import org.simantics.diagram.adapter.SyncElementFactory;
-import org.simantics.diagram.stubs.DiagramResource;
-import org.simantics.diagram.ui.DiagramModelHints;
-import org.simantics.district.network.ontology.DistrictNetworkResource;
-import org.simantics.district.network.ui.DistrictNetworkEdge;
-import org.simantics.g2d.canvas.ICanvasContext;
-import org.simantics.g2d.diagram.IDiagram;
-import org.simantics.g2d.element.ElementClass;
-import org.simantics.g2d.element.IElement;
-import org.simantics.g2d.element.handler.impl.StaticObjectAdapter;
-
-public class DistrictNetworkEdgeElementFactory extends SyncElementFactory {
-
-    public static final ElementClass CLASS = DistrictNetworkEdgeElement.CLASS;
-    
-    private DistrictNetworkResource DN;
-    private DiagramResource DIA;
-    
-    public DistrictNetworkEdgeElementFactory(ReadGraph graph) {
-        this.DN = DistrictNetworkResource.getInstance(graph);
-        this.DIA = DiagramResource.getInstance(graph);
-    }
-    
-    @Override
-    public void create(AsyncReadGraph graph, ICanvasContext canvas, IDiagram diagram, Resource elementType, AsyncProcedure<ElementClass> procedure) {
-        procedure.execute(graph, CLASS.newClassWith(false, new StaticObjectAdapter(elementType)));
-    }
-    
-    @Override
-    protected Resource getElementClassBaseType(AsyncReadGraph graph) {
-        return DN.Edge;
-    }
-    
-    @Override
-    public void load(ReadGraph graph, ICanvasContext canvas, IDiagram diagram, Resource edgeResource, IElement element) throws DatabaseException {
-        
-        Resource diagramRuntime = diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE);
-        
-        Resource startVertex = graph.getSingleObject(edgeResource, DN.HasStartVertex);
-        Resource endVertex = graph.getSingleObject(edgeResource, DN.HasEndVertex);
-        
-        double[] startCoords = graph.getRelatedValue2(startVertex, DIA.HasLocation);
-        double[] endCoords = graph.getRelatedValue2(endVertex, DIA.HasLocation);
-        
-        Path2D path = new Path2D.Double();
-        path.moveTo(startCoords[0], startCoords[1]);
-        path.lineTo(endCoords[0], endCoords[1]);
-        
-        DistrictNetworkEdge edge = new DistrictNetworkEdge(path);
-        
-        element.setHint(DistrictNetworkEdgeElement.KEY_DN_EDGE, edge);
-    }
-}
+package org.simantics.district.network.ui.adapters;
+
+import java.awt.geom.Path2D;
+
+import org.simantics.db.AsyncReadGraph;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.procedure.AsyncProcedure;
+import org.simantics.diagram.adapter.SyncElementFactory;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.diagram.synchronization.IModifiableSynchronizationContext;
+import org.simantics.diagram.synchronization.SynchronizationHints;
+import org.simantics.diagram.synchronization.graph.GraphSynchronizationHints;
+import org.simantics.diagram.synchronization.graph.layer.GraphLayerManager;
+import org.simantics.diagram.ui.DiagramModelHints;
+import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.district.network.ui.DistrictNetworkEdge;
+import org.simantics.g2d.canvas.ICanvasContext;
+import org.simantics.g2d.diagram.DiagramHints;
+import org.simantics.g2d.diagram.IDiagram;
+import org.simantics.g2d.element.ElementClass;
+import org.simantics.g2d.element.IElement;
+import org.simantics.g2d.element.handler.impl.StaticObjectAdapter;
+import org.simantics.g2d.layers.ILayersEditor;
+
+public class DistrictNetworkEdgeElementFactory extends SyncElementFactory {
+
+    public static final ElementClass CLASS = DistrictNetworkEdgeElement.CLASS;
+    
+    private DistrictNetworkResource DN;
+    private DiagramResource DIA;
+    
+    public DistrictNetworkEdgeElementFactory(ReadGraph graph) {
+        this.DN = DistrictNetworkResource.getInstance(graph);
+        this.DIA = DiagramResource.getInstance(graph);
+    }
+    
+    @Override
+    public void create(AsyncReadGraph graph, ICanvasContext canvas, IDiagram diagram, Resource elementType, AsyncProcedure<ElementClass> procedure) {
+        procedure.execute(graph, CLASS.newClassWith(false, new StaticObjectAdapter(elementType)));
+    }
+    
+    @Override
+    protected Resource getElementClassBaseType(AsyncReadGraph graph) {
+        return DN.Edge;
+    }
+    
+    @Override
+    public void load(ReadGraph graph, ICanvasContext canvas, IDiagram diagram, Resource edgeResource, IElement element) throws DatabaseException {
+        
+        Resource diagramRuntime = diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE);
+        
+        Resource startVertex = graph.getSingleObject(edgeResource, DN.HasStartVertex);
+        Resource endVertex = graph.getSingleObject(edgeResource, DN.HasEndVertex);
+        
+        double[] startCoords = graph.getRelatedValue2(startVertex, DIA.HasLocation);
+        double[] endCoords = graph.getRelatedValue2(endVertex, DIA.HasLocation);
+        
+        Path2D path = new Path2D.Double();
+        path.moveTo(startCoords[0], startCoords[1]);
+        path.lineTo(endCoords[0], endCoords[1]);
+        
+        DistrictNetworkEdge edge = new DistrictNetworkEdge(path);
+        
+        element.setHint(DistrictNetworkEdgeElement.KEY_DN_EDGE, edge);
+        
+        IModifiableSynchronizationContext context = diagram.getHint(SynchronizationHints.CONTEXT);
+        GraphLayerManager layerManager = context.get(GraphSynchronizationHints.GRAPH_LAYER_MANAGER);
+        
+        ILayersEditor layersEditor = diagram.getHint(DiagramHints.KEY_LAYERS_EDITOR);
+        layerManager.loadLayersForElement(graph, layersEditor, element, edgeResource);
+        
+    }
+}