From 70c2b2d1ae548816d7e2fdd2ca1f28351c4aeeea Mon Sep 17 00:00:00 2001 From: lehtonen Date: Tue, 26 Apr 2016 11:23:35 +0000 Subject: [PATCH] (refs #6022) Added new org.simantics.sysdyn.internal.p2 feature as a part of the sysdyn headless feature structure to be able to build a P2 site of Sysdyn that can be installed into Simantics desktop. Fixed copyrights/licenses of features also. git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@32709 ac1ea38d-2e2b-0410-8846-a27921b304fc --- org.simantics.sysdyn.feature/feature.xml | 2 +- .../feature.xml | 134 +----------------- .../feature.xml | 80 +++++------ .../feature.xml | 25 +++- .../sysdyn/ui/elements/LoopFactory.java | 4 - 5 files changed, 56 insertions(+), 189 deletions(-) diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml index f652ec52..dbe2c387 100644 --- a/org.simantics.sysdyn.feature/feature.xml +++ b/org.simantics.sysdyn.feature/feature.xml @@ -16,7 +16,7 @@ version="1.9.1.qualifier" provider-name="VTT Technical Research Centre of Finland"> - + Simantics System Dynamics product with internal custom solver and bundled OpenModelica. diff --git a/org.simantics.sysdyn.internal.feature/feature.xml b/org.simantics.sysdyn.internal.feature/feature.xml index 4bcbf3a6..f77c6dfd 100644 --- a/org.simantics.sysdyn.internal.feature/feature.xml +++ b/org.simantics.sysdyn.internal.feature/feature.xml @@ -5,12 +5,12 @@ version="1.9.1.qualifier" provider-name="VTT Technical Research Centre of Finland"> - + Simantics System Dynamics product with custom internal solver only. - Copyright (c) 2007, 2010 Association for Decentralized Information + Copyright (c) 2007, 2016 Association for Decentralized Information Management in Industry THTH ry.<br/> All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License @@ -50,134 +50,8 @@ v1.0 which accompanies this distribution, and is available at id="org.simantics.eclipsec.launcher" version="0.0.0"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.simantics.sysdyn.internal.p2.feature/feature.xml b/org.simantics.sysdyn.internal.p2.feature/feature.xml index 47d60ab2..a5526d97 100644 --- a/org.simantics.sysdyn.internal.p2.feature/feature.xml +++ b/org.simantics.sysdyn.internal.p2.feature/feature.xml @@ -1,21 +1,28 @@ + provider-name="Semantum Oy"> - [Enter Feature Description here.] + Simantics System Dynamics feature with custom internal solver only. + This feature can be installed into the generic Simantics Desktop product. - - [Enter Copyright Description here.] + + Copyright (c) 2016 Association for Decentralized Information +Management in Industry THTH ry.<br/> +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License +v1.0 which accompanies this distribution, and is available at +<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> - - [Enter License Description here.] + + Licensed under Eclipse Public License (EPL) 1.0. + - - - - - - + version="0.0.0"/> + version="0.0.0"/> diff --git a/org.simantics.sysdyn.product.site.feature/feature.xml b/org.simantics.sysdyn.product.site.feature/feature.xml index c2ab993f..5bc85f89 100644 --- a/org.simantics.sysdyn.product.site.feature/feature.xml +++ b/org.simantics.sysdyn.product.site.feature/feature.xml @@ -2,19 +2,26 @@ - - [Enter Feature Description here.] + + Sysdyn feature for headless product and feature builds that includes + all the other sysdyn features necessary for making the P2 site + and product builds. - - [Enter Copyright Description here.] + + Copyright (c) 2016 Association for Decentralized Information +Management in Industry THTH ry.<br/> +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License +v1.0 which accompanies this distribution, and is available at +<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> - - [Enter License Description here.] + + Licensed under Eclipse Public License (EPL) 1.0. + + diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/LoopFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/LoopFactory.java index 2498e4a4..260588c2 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/LoopFactory.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/LoopFactory.java @@ -62,14 +62,10 @@ import org.simantics.g2d.svg.SVGImage; import org.simantics.g2d.utils.Alignment; import org.simantics.modeling.ModelingResources; import org.simantics.scenegraph.g2d.G2DParentNode; -import org.simantics.scenegraph.g2d.events.MouseEvent; -import org.simantics.scenegraph.g2d.events.MouseEvent.MouseEnterEvent; -import org.simantics.scenegraph.g2d.events.MouseEvent.MouseExitEvent; import org.simantics.scenegraph.g2d.nodes.SVGNode; import org.simantics.scenegraph.g2d.nodes.ShapeNode; import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.ui.properties.LoopTab; -import org.simantics.sysdyn.ui.utils.SysdynWorkbenchUtils; import org.simantics.sysdyn.utils.LoopUtils; import org.simantics.ui.SimanticsUI; import org.simantics.utils.datastructures.Callback; -- 2.47.1