Added four Sysdyn molecules (refs #4343).

Changed Sysdyn sample model file extensions (refs #4737).
Changed Sysdyn version to 1.8.
Allow double click to expand Sysdyn model in model browser (refs #4742).

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

diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml
index e9e11f98964373e83e5ac8b4bc9fcdae0da0f0d6..3aac23110a1807c95a02e60b7a550242eec32167 100644 (file)
--- a/org.simantics.sysdyn.feature/feature.xml
+++ b/org.simantics.sysdyn.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature\r
       id="org.simantics.sysdyn"\r
       label="Simantics System Dynamics Feature"\r
-      version="1.7.0.qualifier"\r
+      version="1.8.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdyn
new file mode 100644 (file)
index 0000000..cacb360
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdyn differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdynModule b/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdynModule
new file mode 100644 (file)
index 0000000..31429c2
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdynModule differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdyn
new file mode 100644 (file)
index 0000000..334ca7e
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdyn differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdynModule b/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdynModule
new file mode 100644 (file)
index 0000000..78e03cc
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdynModule differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdyn
new file mode 100644 (file)
index 0000000..2abde7d
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdyn differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule b/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule
new file mode 100644 (file)
index 0000000..c4cfc40
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdyn
new file mode 100644 (file)
index 0000000..caa66ce
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdyn differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdynModule b/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdynModule
new file mode 100644 (file)
index 0000000..1186b74
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdynModule differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/Tester For Molecules.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/Tester For Molecules.sysdyn
new file mode 100644 (file)
index 0000000..5a96a7e
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/Tester For Molecules.sysdyn differ

diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.tg b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn
similarity index 100%
rename from org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.tg
rename to org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn

diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.tg b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn
similarity index 100%
rename from org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.tg
rename to org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn

diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.tg b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn
similarity index 100%
rename from org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.tg
rename to org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn

diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.tg b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn
similarity index 100%
rename from org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.tg
rename to org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn

diff --git a/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.tg b/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn
similarity index 100%
rename from org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.tg
rename to org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn

diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 119c139fcbfbc104efb4df30d8d168fbe63f2483..25abc27c00ae7e8e3f74b23f5d27daa2ccfe6c1f 100644 (file)
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simantics System Dynamics UI
 Bundle-SymbolicName: org.simantics.sysdyn.ui;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.scenegraph;bundle-version="0.9.0",

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java
index eb7229b1e080914d8cd9e3a93b9a9eaca63d578c..660fe185108c48855429b56772caf8a948886266 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java
@@ -133,7 +133,7 @@ public class ModelNode extends AbstractNode<Resource> implements IDoubleClickabl
 \r
        @Override\r
        public boolean handleDoubleClick() {\r
-               return true;\r
+               return false;\r
        }\r
 \r
 }\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
index bb04e70ec18886021b94f97337dfe99691a3ce63..34f8fd71761f030702b4ccb76abc0ba4a64457c0 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
@@ -67,6 +67,8 @@ public class DependencyRouter implements IRouter2 {
     }\r
        \r
        public static Arc2D createArc(Arc2D arc, Shape beginBounds, Shape endBounds, double angle) {\r
+               if (beginBounds == null || endBounds == null)\r
+                       return new Arc2D.Double();\r
                double x0 = beginBounds.getBounds2D().getCenterX();\r
         double y0 = beginBounds.getBounds2D().getCenterY();\r
         double x1 = endBounds.getBounds2D().getCenterX();\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementNoBounds.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementNoBounds.java
index 76defa5bd17a76657ed84b75c4024f2dd4441ebf..3d6eda9e2463bb98c326ec522c91820af18cd89e 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementNoBounds.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementNoBounds.java
@@ -108,6 +108,8 @@ public class SysdynTextElementNoBounds extends TextElementNoBounds {
                     @Override\r
                     public void textEditingStarted() {\r
                         TextNode node = (TextNode) e.getHint(SG_NODE);\r
+                        if (node == null)\r
+                               return;\r
                         textBeforeEdit = node.getText();\r
 \r
                         if(component != null) return;\r

diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.ui/sysdyn.product
index ebda30ea6fc3a70702e4bac9188bd93f4832911c..5c3c71bbffe3439f62702319fccf3a95504d6826 100644 (file)
--- a/org.simantics.sysdyn.ui/sysdyn.product
+++ b/org.simantics.sysdyn.ui/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="org.simantics.sysdyn.product.Sysdyn" id="org.simantics.sysdyn.ui.product" application="org.simantics.workbench.application" version="1.7" useFeatures="true" includeLaunchers="false">\r
+<product name="Simantics System Dynamic Tool" uid="org.simantics.sysdyn.product.Sysdyn" id="org.simantics.sysdyn.ui.product" application="org.simantics.workbench.application" version="1.8" useFeatures="true" includeLaunchers="false">\r
 \r
    <aboutInfo>\r
       <text>\r
@@ -13,11 +13,12 @@
    </configIni>\r
 \r
    <launcherArgs>\r
-      <programArgs>-fixerrors\r
---launcher.XXMaxPermSize 192m\r
+      <programArgs>-fixerrors
+--launcher.XXMaxPermSize 192m
 -data @noDefault</programArgs>\r
       <vmArgs>-ea  -Xmx768M -XX:MaxPermSize=192m -Xshare:off -Dorg.simantics.undo.enabled=false</vmArgs>\r
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
+      <vmArgsWin>-Dorg.osgi.framework.os.name=win32</vmArgsWin>\r
    </launcherArgs>\r
 \r
    <windowImages i16="/org.simantics.sysdyn.ui/icons/sysdyn.png"/>\r
@@ -31,6 +32,7 @@
       </win>\r
    </launcher>\r
 \r
+\r
    <vm>\r
       <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>\r
    </vm>\r
@@ -115,7 +117,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </plugins>\r
 \r
    <features>\r
-      <feature id="org.simantics.sysdyn" version="1.7.0.qualifier"/>\r
+      <feature id="org.simantics.sysdyn" version="1.8.0.qualifier"/>\r
    </features>\r
 \r
 \r

diff --git a/org.simantics.sysdyn/META-INF/MANIFEST.MF b/org.simantics.sysdyn/META-INF/MANIFEST.MF
index 6c9fef506d7183554d3f1dc413b95b6b5230bcde..e64d1b51d0b1b22a686c370c6affc16803aba1d1 100644 (file)
--- a/org.simantics.sysdyn/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simantics System Dynamics
 Bundle-SymbolicName: org.simantics.sysdyn;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.simantics.objmap;bundle-version="0.1.0",
  org.simantics.db;bundle-version="0.6.2",

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java
index 133dfb4b39b114cc51ba70fa64f099c79a1cd945..5b63087588acfc1f1ac32b08b070f774116db821 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java
@@ -191,7 +191,7 @@ public class UnitUtils {
             if(e instanceof Variable) {\r
                 Variable var = (Variable)e;\r
                 try {\r
-                       if(var.getName().equals(element))\r
+                       if (element.equals(var.getName()))\r
                                return var;\r
                 } catch (NullPointerException npe) {\r
                        npe.printStackTrace();\r