Update version numbers and API to 1.35.2.

Use new API of TerminalUtil.pickTerminal().

Change-Id: I6c3dcefbffbd8250eefd7f2ea642355fb6b8117f

diff --git a/bundles/org.simantics.sysdyn.product/plugin.properties b/bundles/org.simantics.sysdyn.product/plugin.properties
index ec483163aa9ab61183b55090cd661efd99c8770e..2501cd55a966c7d705463d4c2392038dc9a08ec7 100644 (file)
--- a/bundles/org.simantics.sysdyn.product/plugin.properties
+++ b/bundles/org.simantics.sysdyn.product/plugin.properties
@@ -1,6 +1,6 @@
 about.text = Simantics System Dynamics\n\\r
 \n\\r
-Version 1.35.0\n\\r
+Version 1.35.2\n\\r
 \n\\r
 Copyright (c) 2018 Association for Decentralized Information Management in Industry THTH ry.\n\\r
 \n\\r

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynPointerInteractor.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynPointerInteractor.java
index ef74d7b5afb6ac62dce7bba836025fc8d75c8b0f..3d6e871a849c022bc3440ff8ca040cfafffe9ebb 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynPointerInteractor.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynPointerInteractor.java
@@ -181,6 +181,6 @@ public class SysdynPointerInteractor extends PointerInteractor {
        public List<TerminalInfo> pickTerminals(Point2D controlPos) {\r
                Rectangle2D controlPickRect = new Rectangle2D.Double(controlPos.getX()-SysdynPointerInteractor.PICK_DIST, controlPos.getY()-SysdynPointerInteractor.PICK_DIST, SysdynPointerInteractor.PICK_DIST*2+1, SysdynPointerInteractor.PICK_DIST*2+1);\r
                Shape       canvasPickRect  = GeometryUtils.transformShape(controlPickRect, util.getInverseTransform());\r
-               return TerminalUtil.pickTerminals(diagram, canvasPickRect, false, true);\r
+               return TerminalUtil.pickTerminals(getContext(), diagram, canvasPickRect, false, true);\r
        }\r
 }\r

diff --git a/releng/org.simantics.sysdyn.rcp.product/sysdyn.product b/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
index 49f7b2e901a3ed8dbf1e629aeaef8e1c06bbe072..6d8e492b1988a3daf5815a92ffa9d5a3f3ed6e27 100644 (file)
--- a/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
+++ b/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r
-<product name="Simantics System Dynamic Tool" uid="Simantics-Sysdyn" id="org.simantics.sysdyn.product.product" application="org.simantics.workbench.application" version="1.35.0" useFeatures="true" includeLaunchers="true">\r
+<product name="Simantics System Dynamic Tool" uid="Simantics-Sysdyn" id="org.simantics.sysdyn.product.product" application="org.simantics.workbench.application" version="1.35.2" useFeatures="true" includeLaunchers="true">\r
 \r
    <aboutInfo>\r
       <image path="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>\r

diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
index c238f1191da172272261016c13fca75e728242ca..bfac136cdc93aa955ddd23786a287b4f4eabe0e5 100644 (file)
--- a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
+++ b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
@@ -11,7 +11,7 @@
                <tycho.version>1.0.0</tycho.version>
                <tycho.extras.version>1.0.0</tycho.extras.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <branch-spec>release/1.35.0</branch-spec>
+               <branch-spec>release/1.35.2</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
        </properties>