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%2FDistrictNetworkEdgeElement.java;h=12f26182dca15fe03cd4cf02ff6588a2a3954f3f;hb=16ee01dc5a40981c58fd5b478b89552e5814e8bb;hp=a53c02d2e0ba98708b8661cf64379f4f6a232545;hpb=9dace20146d19dd0541480a80fd289de45b6cfc8;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java
index a53c02d2..12f26182 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java
@@ -1,75 +1,116 @@
-package org.simantics.district.network.ui.adapters;
-
-import java.awt.geom.Rectangle2D;
-
-import org.simantics.district.network.ui.DistrictNetworkEdge;
-import org.simantics.district.network.ui.nodes.DistrictNetworkEdgeNode;
-import org.simantics.g2d.element.ElementClass;
-import org.simantics.g2d.element.ElementUtils;
-import org.simantics.g2d.element.IElement;
-import org.simantics.g2d.element.SceneGraphNodeKey;
-import org.simantics.g2d.element.handler.InternalSize;
-import org.simantics.g2d.element.handler.SceneGraph;
-import org.simantics.g2d.element.handler.impl.DefaultTransform;
-import org.simantics.scenegraph.g2d.G2DParentNode;
-import org.simantics.utils.datastructures.hints.IHintContext.Key;
-import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
-
-public class DistrictNetworkEdgeElement {
-
-    public static final Key KEY_DN_EDGE = new KeyOf(DistrictNetworkEdge.class, "DN_EDGE");
-    public static final Key KEY_DN_EDGE_NODE = new SceneGraphNodeKey(DistrictNetworkEdgeNode.class, "DN_EDGE_NODE");
-    
-    public static final ElementClass CLASS =
-            ElementClass.compile(
-                    DefaultTransform.INSTANCE,
-                    DNEdgeInternalSize.INSTANCE,
-                    DNEdgeSceneGraph.INSTANCE
-            ).setId(DistrictNetworkEdgeElement.class.getSimpleName());
-    
-    static final class DNEdgeSceneGraph implements SceneGraph {
-        
-        public static final DNEdgeSceneGraph INSTANCE = new DNEdgeSceneGraph();
-
-        private static final long serialVersionUID = 8894367073815556871L;
-
-        @Override
-        public void init(IElement edgeElement, G2DParentNode parent) {
-            DistrictNetworkEdge edge = edgeElement.getHint(KEY_DN_EDGE);
-            if (edge == null) {
-                cleanup(edgeElement);
-            } else {
-                DistrictNetworkEdgeNode node = edgeElement.getHint(KEY_DN_EDGE_NODE);
-                if (node == null) {
-                    node = parent.addNode(ElementUtils.generateNodeId(edgeElement), DistrictNetworkEdgeNode.class);
-                    edgeElement.setHint(KEY_DN_EDGE_NODE, node);
-                }
-                node.setDNEdge(edge);
-            }
-        }
-
-        @Override
-        public void cleanup(IElement edge) {
-            ElementUtils.removePossibleNode(edge, KEY_DN_EDGE_NODE);
-            edge.removeHint(KEY_DN_EDGE_NODE);
-        }
-    }
-    
-    static final class DNEdgeInternalSize implements InternalSize {
-
-        private static final long serialVersionUID = -2725017034692179676L;
-        
-        public static final DNEdgeInternalSize INSTANCE = new DNEdgeInternalSize();
-
-        @Override
-        public Rectangle2D getBounds(IElement e, Rectangle2D size) {
-            DistrictNetworkEdge edge = e.getHint(KEY_DN_EDGE);
-            if (size == null)
-                size = new Rectangle2D.Double();
-            edge.getBounds(size);
-
-            return size;
-        }
-        
-    }
-}
+package org.simantics.district.network.ui.adapters;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.simantics.district.network.ui.DistrictNetworkEdge;
+import org.simantics.district.network.ui.nodes.DistrictNetworkEdgeNode;
+import org.simantics.g2d.connection.handler.ConnectionHandler;
+import org.simantics.g2d.diagram.handler.Topology.Connection;
+import org.simantics.g2d.element.ElementClass;
+import org.simantics.g2d.element.ElementUtils;
+import org.simantics.g2d.element.IElement;
+import org.simantics.g2d.element.SceneGraphNodeKey;
+import org.simantics.g2d.element.handler.InternalSize;
+import org.simantics.g2d.element.handler.SceneGraph;
+import org.simantics.g2d.element.handler.impl.DefaultTransform;
+import org.simantics.g2d.element.handler.impl.SimpleElementLayers;
+import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.utils.datastructures.hints.IHintContext.Key;
+import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DistrictNetworkEdgeElement {
+
+    public static final Key KEY_DN_EDGE = new KeyOf(DistrictNetworkEdge.class, "DN_EDGE");
+    public static final Key KEY_DN_EDGE_NODE = new SceneGraphNodeKey(DistrictNetworkEdgeNode.class, "DN_EDGE_NODE");
+    
+    public static final ElementClass CLASS =
+            ElementClass.compile(
+                    DefaultTransform.INSTANCE,
+                    DNEdgeInternalSize.INSTANCE,
+                    DNEdgeSceneGraph.INSTANCE,
+                    DNEdgeConnectionHandler.INSTANCE,
+                    SimpleElementLayers.INSTANCE
+            ).setId(DistrictNetworkEdgeElement.class.getSimpleName());
+    
+    static final class DNEdgeSceneGraph implements SceneGraph {
+        
+        public static final DNEdgeSceneGraph INSTANCE = new DNEdgeSceneGraph();
+
+        private static final long serialVersionUID = 8894367073815556871L;
+
+        @Override
+        public void init(IElement edgeElement, G2DParentNode parent) {
+            DistrictNetworkEdge edge = edgeElement.getHint(KEY_DN_EDGE);
+            if (edge == null) {
+                cleanup(edgeElement);
+            } else {
+                DistrictNetworkEdgeNode node = edgeElement.getHint(KEY_DN_EDGE_NODE);
+                if (node == null) {
+                    node = parent.addNode(ElementUtils.generateNodeId(edgeElement), DistrictNetworkEdgeNode.class);
+                    edgeElement.setHint(KEY_DN_EDGE_NODE, node);
+                }
+                node.setDNEdge(edge);
+            }
+        }
+
+        @Override
+        public void cleanup(IElement edge) {
+            ElementUtils.removePossibleNode(edge, KEY_DN_EDGE_NODE);
+            edge.removeHint(KEY_DN_EDGE_NODE);
+        }
+    }
+    
+    static final class DNEdgeInternalSize implements InternalSize {
+
+        private static final Logger LOGGER = LoggerFactory.getLogger(DNEdgeInternalSize.class);
+        
+        private static final long serialVersionUID = -2725017034692179676L;
+        
+        public static final DNEdgeInternalSize INSTANCE = new DNEdgeInternalSize();
+
+        @Override
+        public Rectangle2D getBounds(IElement e, Rectangle2D size) {
+            DistrictNetworkEdge edge = e.getHint(KEY_DN_EDGE);
+            if (size == null)
+                size = new Rectangle2D.Double();
+            if (edge != null)
+                edge.getBounds(size);
+            else
+                LOGGER.debug("Element {} does not have edge!", e);
+
+            return size;
+        }
+        
+    }
+    
+    static class DNEdgeConnectionHandler implements ConnectionHandler {
+
+        private static final long serialVersionUID = -410377314637446238L;
+        
+        public static final DNEdgeConnectionHandler INSTANCE = new DNEdgeConnectionHandler();
+
+        @Override
+        public Collection<IElement> getChildren(IElement connection, Collection<IElement> result) {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public Collection<IElement> getBranchPoints(IElement connection, Collection<IElement> result) {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public Collection<IElement> getSegments(IElement connection, Collection<IElement> result) {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public Collection<Connection> getTerminalConnections(IElement connection, Collection<Connection> result) {
+            return Collections.emptyList();
+        }
+    }
+}