From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 21 Sep 2011 17:00:44 +0000 (+0000)
Subject: Moved some more GeometryUtils and TransformedRectangle into os.scenegraph from os... 
X-Git-Tag: simantics-1.5~26
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3f3bb24db9301ad83b8d4fa191d7455e2c17dce7;p=simantics%2Fsysdyn.git

Moved some more GeometryUtils and TransformedRectangle into os.scenegraph from os.g2d.
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 57d71c15..db56e864 100644
--- 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();
                 	}
                 } else if (ti != null && ti == startFlag) {
-                    c.parentObstacle = GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),
+                    c.parentObstacle = org.simantics.scenegraph.utils.GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),
                     		ElementUtils.getElementBoundsOnDiagram(ti.e).getBounds2D());
                 } else {
-                    c.parentObstacle = GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),
+                    c.parentObstacle = org.simantics.scenegraph.utils.GeometryUtils.transformRectangle(AffineTransform.getTranslateInstance(c.x, c.y),
                             BranchPointClass.DEFAULT_IMAGE2.getBounds());
                     
                 }
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 efa0c349..ed1fc608 100644
--- 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.
                     final double exp = 0.1;
                     if (w <= 0.0)
-                        shape = GeometryUtils.expandRectangle(bounds, 0, 0, exp, exp);
+                        shape = org.simantics.scenegraph.utils.GeometryUtils.expandRectangle(bounds, 0, 0, exp, exp);
                     else if (h <= 0.0)
-                        shape = GeometryUtils.expandRectangle(bounds, exp, exp, 0, 0);
+                        shape = org.simantics.scenegraph.utils.GeometryUtils.expandRectangle(bounds, exp, exp, 0, 0);
                 }
 
                 //System.out.println("    final shape: " + shape);