(refs #6022) Added new org.simantics.sysdyn.internal.p2 feature as a part of the...

Fixed copyrights/licenses of features also.

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

diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml
index f652ec529e692653d94c7955fd09ad3866ab205c..dbe2c387500b1e754950c4c068808c49f86dabba 100644 (file)
--- a/org.simantics.sysdyn.feature/feature.xml
+++ b/org.simantics.sysdyn.feature/feature.xml
@@ -16,7 +16,7 @@
       version="1.9.1.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
-   <description url="http://www.example.com/description">\r
+   <description>\r
       Simantics System Dynamics product with internal custom solver and bundled OpenModelica.\r
    </description>\r
 \r

diff --git a/org.simantics.sysdyn.internal.feature/feature.xml b/org.simantics.sysdyn.internal.feature/feature.xml
index 4bcbf3a6c7744ee253cef2952315f907606e1607..f77c6dfdd699dea6b5483cda95293de34b3ee33d 100644 (file)
--- 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"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
-   <description url="http://www.example.com/description">\r
+   <description>\r
       Simantics System Dynamics product with custom internal solver only.\r
    </description>\r
 \r
    <copyright>\r
-      Copyright (c) 2007, 2010 Association for Decentralized Information
+      Copyright (c) 2007, 2016 Association for Decentralized Information
 Management in Industry THTH ry.&lt;br/&gt;
 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"\r
          version="0.0.0"/>\r
 \r
-   <plugin\r
-         id="org.simantics.objmap"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.sysdyn"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.sysdyn.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.modelica"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.sysdyn.ontology"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="freemarker"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.antlr.runtime"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.jfreechart.ontology"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.nebula.widgets.tablecombo"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.fmu"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.fmu.me.win32"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"/>\r
-\r
-   <plugin\r
-         id="org.simantics.jfreechart"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="fi.semantum.sysdyn.solver"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.fmu.me.win64"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
+   <includes\r
+         id="org.simantics.sysdyn.internal.p2"\r
          version="0.0.0"/>\r
 \r
-   <plugin\r
-         id="org.simantics.sysdyn.xmile"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.document.linking.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.objmap2"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.simantics.document.linking.ontology"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
 </feature>\r

diff --git a/org.simantics.sysdyn.internal.p2.feature/feature.xml b/org.simantics.sysdyn.internal.p2.feature/feature.xml
index 47d60ab27f45f5e4ee3bdb3d7277063d9b42ebfe..a5526d976d1d8685ddb077e0f17ebc512bb3380e 100644 (file)
--- a/org.simantics.sysdyn.internal.p2.feature/feature.xml
+++ b/org.simantics.sysdyn.internal.p2.feature/feature.xml
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
       id="org.simantics.sysdyn.internal.p2"\r
-      label="Simantics System Dynamics Internal Solver P2 Feature"\r
+      label="Simantics System Dynamics with Internal Solver P2 Site"\r
       version="1.9.1.qualifier"\r
-      provider-name="VTT Technical Research Centre of Finland">\r
+      provider-name="Semantum Oy">\r
 \r
    <description url="http://www.example.com/description">\r
-      [Enter Feature Description here.]\r
+      Simantics System Dynamics feature with custom internal solver only.\r
+      This feature can be installed into the generic Simantics Desktop product.\r
    </description>\r
 \r
-   <copyright url="http://www.example.com/copyright">\r
-      [Enter Copyright Description here.]\r
+   <copyright>\r
+      Copyright (c) 2016 Association for Decentralized Information\r
+Management in Industry THTH ry.&lt;br/&gt;\r
+All rights reserved. This program and the accompanying materials\r
+are made available under the terms of the Eclipse Public License\r
+v1.0 which accompanies this distribution, and is available at\r
+&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;\r
    </copyright>\r
 \r
-   <license url="http://www.example.com/license">\r
-      [Enter License Description here.]\r
+   <license url="http://www.eclipse.org/legal/epl-v10.html">\r
+      Licensed under Eclipse Public License (EPL) 1.0.\r
    </license>\r
+\r
    <plugin\r
          id="org.simantics.objmap"\r
          download-size="0"\r
@@ -37,13 +44,6 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-   <plugin\r
-         id="org.simantics.modelica"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
    <plugin\r
          id="org.simantics.sysdyn.ontology"\r
          download-size="0"\r
@@ -52,98 +52,84 @@
          unpack="false"/>\r
 \r
    <plugin\r
-         id="freemarker"\r
+         id="fi.semantum.sysdyn.solver"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.antlr.runtime"\r
+         id="org.simantics.sysdyn.xmile"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.jfreechart.ontology"\r
+         id="freemarker"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.eclipse.nebula.widgets.tablecombo"\r
+         id="org.antlr.runtime"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.fmu"\r
+         id="org.simantics.modelica"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.fmu.me.win32"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"/>\r
-\r
-   <plugin\r
-         id="org.simantics.jfreechart"\r
+         id="org.simantics.jfreechart.ontology"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="fi.semantum.sysdyn.solver"\r
+         id="org.simantics.jfreechart"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.fmu.me.win64"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"/>\r
-\r
-   <plugin\r
-         id="org.simantics.sysdyn.xmile"\r
+         id="org.eclipse.nebula.widgets.tablecombo"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.document.linking.ui"\r
+         id="org.simantics.fmu"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.objmap2"\r
+         id="org.simantics.fmu.me.win32"\r
+         os="win32"\r
+         ws="win32"\r
+         arch="x86"\r
          download-size="0"\r
          install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
+         version="0.0.0"/>\r
 \r
    <plugin\r
-         id="org.simantics.document.linking.ontology"\r
+         id="org.simantics.fmu.me.win64"\r
+         os="win32"\r
+         ws="win32"\r
+         arch="x86_64"\r
          download-size="0"\r
          install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
+         version="0.0.0"/>\r
 \r
 </feature>\r

diff --git a/org.simantics.sysdyn.product.site.feature/feature.xml b/org.simantics.sysdyn.product.site.feature/feature.xml
index c2ab993f6a60eb8d356a042064bade98a3a77218..5bc85f8974b4caed6b8a320e262795293a60b56d 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/feature.xml
+++ b/org.simantics.sysdyn.product.site.feature/feature.xml
@@ -2,19 +2,26 @@
 <feature\r
       id="org.simantics.sysdyn.product.site"\r
       label="Sysdyn Product Site"\r
-      version="1.9.0.qualifier"\r
+      version="1.9.1.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
-   <description url="http://www.example.com/description">\r
-      [Enter Feature Description here.]\r
+   <description>\r
+      Sysdyn feature for headless product and feature builds that includes\r
+      all the other sysdyn features necessary for making the P2 site\r
+      and product builds.\r
    </description>\r
 \r
-   <copyright url="http://www.example.com/copyright">\r
-      [Enter Copyright Description here.]\r
+   <copyright>\r
+      Copyright (c) 2016 Association for Decentralized Information
+Management in Industry THTH ry.&lt;br/&gt;
+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
+&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;\r
    </copyright>\r
 \r
-   <license url="http://www.example.com/license">\r
-      [Enter License Description here.]\r
+   <license url="http://www.eclipse.org/legal/epl-v10.html">\r
+      Licensed under Eclipse Public License (EPL) 1.0.\r
    </license>\r
 \r
    <includes\r
@@ -25,4 +32,8 @@
          id="org.simantics.om"\r
          version="0.0.0"/>\r
 \r
+   <includes\r
+         id="org.simantics.sysdyn.internal.p2"\r
+         version="0.0.0"/>\r
+\r
 </feature>\r

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 2498e4a487f49de12f24ab61dea204fbfea9cd87..260588c24e0c615281c1538238fe36c3efc2ddba 100644 (file)
--- 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;\r
 import org.simantics.modeling.ModelingResources;\r
 import org.simantics.scenegraph.g2d.G2DParentNode;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseEnterEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseExitEvent;\r
 import org.simantics.scenegraph.g2d.nodes.SVGNode;\r
 import org.simantics.scenegraph.g2d.nodes.ShapeNode;\r
 import org.simantics.sysdyn.SysdynResource;\r
 import org.simantics.sysdyn.ui.properties.LoopTab;\r
-import org.simantics.sysdyn.ui.utils.SysdynWorkbenchUtils;\r
 import org.simantics.sysdyn.utils.LoopUtils;\r
 import org.simantics.ui.SimanticsUI;\r
 import org.simantics.utils.datastructures.Callback;\r