From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Mon, 18 Nov 2019 11:13:21 +0000 (+0200)
Subject: Update version numbers and API to 1.35.2.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F3551%2F4;p=simantics%2Fsysdyn.git

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 ec483163..2501cd55 100644
--- 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\
 \n\
-Version 1.35.0\n\
+Version 1.35.2\n\
 \n\
 Copyright (c) 2018 Association for Decentralized Information Management in Industry THTH ry.\n\
 \n\
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 ef74d7b5..3d6e871a 100644
--- 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) {
 		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);
 		Shape       canvasPickRect  = GeometryUtils.transformShape(controlPickRect, util.getInverseTransform());
-		return TerminalUtil.pickTerminals(diagram, canvasPickRect, false, true);
+		return TerminalUtil.pickTerminals(getContext(), diagram, canvasPickRect, false, true);
 	}
 }
diff --git a/releng/org.simantics.sysdyn.rcp.product/sysdyn.product b/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
index 49f7b2e9..6d8e492b 100644
--- 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"?>
 <?pde version="3.5"?>
 
-<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">
+<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">
 
    <aboutInfo>
       <image path="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>
diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
index c238f119..bfac136c 100644
--- 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>