Implement district features to Simantics platform

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / adapters / DistrictNetworkEdgeElement.java

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 8ec1430b83c4e0de2d1bbbb5206505f8323c6b9c..a53c02d2e0ba98708b8661cf64379f4f6a232545 100644 (file)
--- 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
@@ -10,7 +10,7 @@ import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.element.SceneGraphNodeKey;\r
 import org.simantics.g2d.element.handler.InternalSize;\r
 import org.simantics.g2d.element.handler.SceneGraph;\r
-import org.simantics.g2d.elementclass.connection.EdgeClass.FixedTransform;\r
+import org.simantics.g2d.element.handler.impl.DefaultTransform;\r
 import org.simantics.scenegraph.g2d.G2DParentNode;\r
 import org.simantics.utils.datastructures.hints.IHintContext.Key;\r
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;\r
@@ -22,7 +22,7 @@ public class DistrictNetworkEdgeElement {
     \r
     public static final ElementClass CLASS =\r
             ElementClass.compile(\r
-                    FixedTransform.INSTANCE,\r
+                    DefaultTransform.INSTANCE,\r
                     DNEdgeInternalSize.INSTANCE,\r
                     DNEdgeSceneGraph.INSTANCE\r
             ).setId(DistrictNetworkEdgeElement.class.getSimpleName());\r
@@ -64,7 +64,11 @@ public class DistrictNetworkEdgeElement {
         @Override\r
         public Rectangle2D getBounds(IElement e, Rectangle2D size) {\r
             DistrictNetworkEdge edge = e.getHint(KEY_DN_EDGE);\r
-            return edge.getBounds(size);\r
+            if (size == null)\r
+                size = new Rectangle2D.Double();\r
+            edge.getBounds(size);\r
+\r
+            return size;\r
         }\r
         \r
     }\r