Moved some more GeometryUtils and TransformedRectangle into os.scenegraph from os...

Added os.scenegraph.g2d.events.EventTypes.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@22364 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java
index 57d71c153353b2f4b5c9f3a51f5c6e637432d13e..db56e8642bf113c049266e415622eaeaa0b7e359 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java
@@ -187,10 +187,10 @@ public class SysdynConnectTool extends ConnectTool2 {
                                c.parentObstacle =  ElementUtils.getElementBoundsOnDiagram(ti.e).getBounds2D();\r
                        }\r
                 } else if (ti != null && ti == startFlag) {\r
-                    c.parentObstacle = GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),\r
+                    c.parentObstacle = org.simantics.scenegraph.utils.GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),\r
                                ElementUtils.getElementBoundsOnDiagram(ti.e).getBounds2D());\r
                 } else {\r
-                    c.parentObstacle = GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),\r
+                    c.parentObstacle = org.simantics.scenegraph.utils.GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),\r
                             BranchPointClass.DEFAULT_IMAGE2.getBounds());\r
                     \r
                 }\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/SysdynConnectionClass.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/SysdynConnectionClass.java
index efa0c3499c95b5455c1e213b8c0efb7850dc9b98..ed1fc6084f69c6cac61c961b532b767ea4833a8a 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/SysdynConnectionClass.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/SysdynConnectionClass.java
@@ -321,9 +321,9 @@ public class SysdynConnectionClass {
                     // Need to expand shape in either width or height to make it visible.\r
                     final double exp = 0.1;\r
                     if (w <= 0.0)\r
-                        shape = GeometryUtils.expandRectangle(bounds, 0, 0, exp, exp);\r
+                        shape = org.simantics.scenegraph.utils.GeometryUtils.expandRectangle(bounds, 0, 0, exp, exp);\r
                     else if (h <= 0.0)\r
-                        shape = GeometryUtils.expandRectangle(bounds, exp, exp, 0, 0);\r
+                        shape = org.simantics.scenegraph.utils.GeometryUtils.expandRectangle(bounds, exp, exp, 0, 0);\r
                 }\r
 \r
                 //System.out.println("    final shape: " + shape);\r