Separated sysdyn.product into two products: one with bundled OpenModelica (sysdyn...

* Ignored some code warnings
* Moved root files to org.simantics.sysdyn.internal feature
* Changed all sysdyn plug-ins to JavaSE-1.7

refs #5865

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

diff --git a/fi.semantum.sysdyn.solver/.classpath b/fi.semantum.sysdyn.solver/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b1dabee38291b97f08cc3a18bee4e65b1e550530 100644 (file)
--- a/fi.semantum.sysdyn.solver/.classpath
+++ b/fi.semantum.sysdyn.solver/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs b/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..11f6e462df7b697da0744bef232871f1aa1b0cb3 100644 (file)
--- a/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs
+++ b/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7\r
+org.eclipse.jdt.core.compiler.compliance=1.7\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.compiler.source=1.7\r

diff --git a/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF b/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
index b1284b63354c692c9a6f35a94de7ab19b85d6efe..24e13f0c86a79a7f35ad6f4c641e0d4c43da07a5 100644 (file)
--- a/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
+++ b/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Solver
+Bundle-Name: Semantum Solver for Simantics System Dynamics
 Bundle-SymbolicName: fi.semantum.sysdyn.solver
 Bundle-Version: 0.1.0.qualifier
 Bundle-Activator: fi.semantum.sysdyn.solver.Activator
@@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.databoard;bundle-version="0.6.5",
  org.simantics.utils.datastructures;bundle-version="1.1.0",
  gnu.trove3;bundle-version="3.0.3"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: fi.semantum.sysdyn.solver

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java
index 846c7fbc3138610953727e3635439f4739fb684b..f4f5c2943db152c0ec9f0b20cf9a2f1d722eaa69 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java
@@ -576,7 +576,9 @@ final public class Environment implements IEnvironment, ISystem {
                        public Object evaluate(IEnvironment environment, int argc) {\r
                                Double numberOfDays = (Double)environment.getValue(0);\r
                                Double numberOfDesigners = (Double)environment.getValue(1);\r
+                               @SuppressWarnings("unused")\r
                                Double rseed = (Double)environment.getValue(2);\r
+                               @SuppressWarnings("unused")\r
                                Array availability = (Array)environment.getValue(3);\r
                                Array result = new Array();\r
                                for(int i=0;i<numberOfDays.intValue()*numberOfDesigners.intValue();i++) {\r
@@ -627,7 +629,9 @@ final public class Environment implements IEnvironment, ISystem {
 \r
                        @Override\r
                        public Object evaluate(IEnvironment environment, int argc) {\r
+                               @SuppressWarnings("unused")\r
                                Double seed = (Double)environment.getValue(0);\r
+                               @SuppressWarnings("unused")\r
                                Double time = (Double)environment.getValue(1);\r
                                return Math.random();\r
                        }\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
index fff4923a46fad6c7d680489f7da33d85c3fe023b..abc9e0883d3bde2482b5a376e68a9020fe9aabe7 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
@@ -51,6 +51,7 @@ public class Parser {
                }\r
        }\r
        \r
+       @SuppressWarnings("unchecked")\r
        public Object walk_(SimpleNode n, int indent, IFrame frame) {\r
                \r
                Model model = frame instanceof Model ? (Model)frame : null;\r
@@ -222,7 +223,7 @@ public class Parser {
                                } else if (o instanceof IExpression) {\r
                                        arguments.add(new Argument("", (IExpression)o));\r
                                } else if (o instanceof ArrayList) {\r
-                                       ArrayList list = (ArrayList)o;\r
+                                       ArrayList<?> list = (ArrayList<?>)o;\r
                                        for(Object o2 : list) {\r
                                                if(o2 instanceof Argument) {\r
                                                        arguments.add((Argument)o2);\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
index c662d61d3efad56b048d67636d66f49fc7190451..61e7ec2ec2f367f0e49abca054d1680cad33c2ef 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
@@ -13,8 +13,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.ArrayList;\r
 \r
-import fi.semantum.sysdyn.solver.parser.SimpleNode;\r
-\r
 public class Solver {\r
 \r
        private static final boolean VALIDATE = true;   \r
@@ -51,9 +49,6 @@ public class Solver {
                ready = false;\r
        }\r
        \r
-       private SimpleNode n;\r
-       private String codeCache = null;\r
-       \r
        private void validate(Variable var, Object value) {\r
                if(VALIDATE) {\r
                        if(value instanceof Double) {\r
@@ -74,28 +69,10 @@ public class Solver {
        \r
        public void prepare(String input) throws Exception {\r
                \r
-               long startNanos = System.nanoTime();\r
+//             long startNanos = System.nanoTime();\r
                \r
                model = CodeCache.getInstance().getModel(input);\r
                \r
-//             if(!input.equals(codeCache)) {\r
-//             \r
-//                     StringReader reader = new StringReader(input);\r
-//                     ModelParser modelParser = new ModelParser(reader);\r
-//                     n = (SimpleNode)modelParser.stored_definition();\r
-//\r
-//                 Parser parser = new Parser();\r
-//                 model = new Model(new Globals(), "", false);\r
-//                     parser.walk(n, 0, model);\r
-//                     \r
-//                     model.prepare();\r
-//                     model.prepareFunctions();\r
-//                     model.sortAssignments();\r
-//\r
-//                     codeCache = input;\r
-//\r
-//             }\r
-               \r
                int size = model.getSize();\r
                \r
                env = new Environment(model, defaultStep, start);\r
@@ -224,7 +201,7 @@ public class Solver {
                started = false;\r
                dirty = false;\r
                \r
-               long endNanos = System.nanoTime();\r
+//             long endNanos = System.nanoTime();\r
                \r
 //             System.err.println("Prepared model in " + 1e-6*(endNanos-startNanos) + "ms.");\r
                \r

diff --git a/org.simantics.fmu.me.win32/.classpath b/org.simantics.fmu.me.win32/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b1dabee38291b97f08cc3a18bee4e65b1e550530 100644 (file)
--- a/org.simantics.fmu.me.win32/.classpath
+++ b/org.simantics.fmu.me.win32/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..11f6e462df7b697da0744bef232871f1aa1b0cb3 100644 (file)
--- a/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7\r
+org.eclipse.jdt.core.compiler.compliance=1.7\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.compiler.source=1.7\r

diff --git a/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF b/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
index c84baa0d24a2fd5a7f8742f7ca415bf437004824..01b3b9fe71ebf71d619404f56505727346dd3538 100644 (file)
--- a/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
+++ b/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Win32 binaries for FMI model exchange
 Bundle-SymbolicName: org.simantics.fmu.me.win32
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.simantics.utils;bundle-version="1.1.0"
 Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))

diff --git a/org.simantics.fmu.me.win64/.classpath b/org.simantics.fmu.me.win64/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b1dabee38291b97f08cc3a18bee4e65b1e550530 100644 (file)
--- a/org.simantics.fmu.me.win64/.classpath
+++ b/org.simantics.fmu.me.win64/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..11f6e462df7b697da0744bef232871f1aa1b0cb3 100644 (file)
--- a/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7\r
+org.eclipse.jdt.core.compiler.compliance=1.7\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.compiler.source=1.7\r

diff --git a/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF b/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
index ea48c6f755e3cf19ac862cdd21f86ffcf16f14e5..2264011e0dc2a3437452918990638a06d9bb5ab3 100644 (file)
--- a/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
+++ b/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Win64 binaries for FMI model exchange
 Bundle-SymbolicName: org.simantics.fmu.me.win64
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.simantics.utils;bundle-version="1.1.0"
 Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))

diff --git a/org.simantics.fmu/.classpath b/org.simantics.fmu/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b1dabee38291b97f08cc3a18bee4e65b1e550530 100644 (file)
--- a/org.simantics.fmu/.classpath
+++ b/org.simantics.fmu/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/org.simantics.fmu/META-INF/MANIFEST.MF b/org.simantics.fmu/META-INF/MANIFEST.MF
index 21efdee94fa3e3424575d8a4dd0dbccd2b52c30d..c311d6ec5b1d6bed8ac210bc229f5d939563405a 100644 (file)
--- a/org.simantics.fmu/META-INF/MANIFEST.MF
+++ b/org.simantics.fmu/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Bundle-Vendor: Semantum Oy
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.utils;bundle-version="1.1.0",
  org.simantics;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.fmu

diff --git a/org.simantics.jfreechart/.classpath b/org.simantics.jfreechart/.classpath
index ed5bcd8e6623466a755db5d0c6757274dba0e8b5..b867942d06743a4b2eaede0a8ceb4637d7de7681 100644 (file)
--- a/org.simantics.jfreechart/.classpath
+++ b/org.simantics.jfreechart/.classpath
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="src" path="src"/>\r
        <classpathentry exported="true" kind="lib" path="batik/batik-awt-util.jar"/>\r
        <classpathentry exported="true" kind="lib" path="batik/batik-dom.jar"/>\r
        <classpathentry exported="true" kind="lib" path="batik/batik-ext.jar"/>\r
@@ -7,8 +10,5 @@
        <classpathentry exported="true" kind="lib" path="batik/batik-svggen.jar"/>\r
        <classpathentry exported="true" kind="lib" path="batik/batik-util.jar"/>\r
        <classpathentry exported="true" kind="lib" path="batik/batik-xml.jar"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs b/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..11f6e462df7b697da0744bef232871f1aa1b0cb3 100644 (file)
--- a/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7\r
+org.eclipse.jdt.core.compiler.compliance=1.7\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.compiler.source=1.7\r

diff --git a/org.simantics.jfreechart/META-INF/MANIFEST.MF b/org.simantics.jfreechart/META-INF/MANIFEST.MF
index fb0ab09c9417bf85331f832f45d4ed451b60e385..1edbb33b8a17a954ec2334e3c5202fca19561743 100644 (file)
--- a/org.simantics.jfreechart/META-INF/MANIFEST.MF
+++ b/org.simantics.jfreechart/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.scenegraph.swing;bundle-version="1.0.0",
  org.simantics.browsing.ui.model;bundle-version="1.0.0",
  org.simantics.selectionview;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.jfreechart,
  org.simantics.jfreechart.chart,

diff --git a/org.simantics.objmap/.classpath b/org.simantics.objmap/.classpath
index 23e107f90bdae60b050eaef7eafd3babb93c04f7..c4a2c5288bda402028a7acfce852aacb7aae944e 100644 (file)
--- a/org.simantics.objmap/.classpath
+++ b/org.simantics.objmap/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="src" path="examples"/>\r

diff --git a/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs b/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs
index fc058b8d1c6bb709af1f153400dce46ec03b9a01..11f6e462df7b697da0744bef232871f1aa1b0cb3 100644 (file)
--- a/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Nov 11 10:38:27 EET 2009\r
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7\r
+org.eclipse.jdt.core.compiler.compliance=1.7\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.compiler.source=1.7\r

diff --git a/org.simantics.objmap/META-INF/MANIFEST.MF b/org.simantics.objmap/META-INF/MANIFEST.MF
index b748d44b5e0c127c07940df8175947c22ecfc7c3..7b8105b7b773a3638378fd77ae6efbb2537b0dcb 100644 (file)
--- a/org.simantics.objmap/META-INF/MANIFEST.MF
+++ b/org.simantics.objmap/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Objmap
 Bundle-SymbolicName: org.simantics.objmap
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: gnu.trove3;bundle-version="3.0.3",
  org.apache.log4j;bundle-version="1.2.15",
  org.simantics.layer0;bundle-version="1.0.0",

diff --git a/org.simantics.sysdyn.feature/build.properties b/org.simantics.sysdyn.feature/build.properties
index 6ec1948b84eddf70c415a9425fd5181fda58006b..c4fca28c4470c72ab0394de19e4ded12dbf295e2 100644 (file)
--- a/org.simantics.sysdyn.feature/build.properties
+++ b/org.simantics.sysdyn.feature/build.properties
@@ -9,8 +9,4 @@
 # Contributors:\r
 #     VTT Technical Research Centre of Finland - initial API and implementation\r
 ###############################################################################\r
-bin.includes = feature.xml\r
-root=rootfiles/\r
-\r
-root.win32.win32.x86.folder.jre=jre/win32.x86\r
-root.win32.win32.x86_64.folder.jre=jre/win32.x86_64
\ No newline at end of file
+bin.includes = feature.xml
\ No newline at end of file

diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml
index 09c95b17724a01194fd83ba3868e78b9cf9a03af..f652ec529e692653d94c7955fd09ad3866ab205c 100644 (file)
--- a/org.simantics.sysdyn.feature/feature.xml
+++ b/org.simantics.sysdyn.feature/feature.xml
@@ -13,163 +13,32 @@
 <feature\r
       id="org.simantics.sysdyn"\r
       label="Simantics System Dynamics Feature"\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
+      Simantics System Dynamics product with internal custom solver and bundled OpenModelica.\r
    </description>\r
 \r
-   <copyright url="http://www.example.com/copyright">\r
-      [Enter Copyright Description here.]\r
+   <copyright>\r
+      Copyright (c) 2015 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
    <includes\r
-         id="org.eclipse.equinox.executable"\r
+         id="org.simantics.sysdyn.internal"\r
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.help"\r
+         id="org.simantics.om"\r
          version="0.0.0"/>\r
 \r
-   <includes\r
-         id="org.simantics.issues"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="org.simantics.modeling"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="org.simantics.issues.ui"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="org.simantics.workbench"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         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.om.win32"\r
-         os="win32"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"/>\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
-         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
 </feature>\r

diff --git a/org.simantics.sysdyn.internal.feature/build.properties b/org.simantics.sysdyn.internal.feature/build.properties
index c4fca28c4470c72ab0394de19e4ded12dbf295e2..6ec1948b84eddf70c415a9425fd5181fda58006b 100644 (file)
--- a/org.simantics.sysdyn.internal.feature/build.properties
+++ b/org.simantics.sysdyn.internal.feature/build.properties
@@ -9,4 +9,8 @@
 # Contributors:\r
 #     VTT Technical Research Centre of Finland - initial API and implementation\r
 ###############################################################################\r
-bin.includes = feature.xml
\ No newline at end of file
+bin.includes = feature.xml\r
+root=rootfiles/\r
+\r
+root.win32.win32.x86.folder.jre=jre/win32.x86\r
+root.win32.win32.x86_64.folder.jre=jre/win32.x86_64
\ No newline at end of file

diff --git a/org.simantics.sysdyn.internal.feature/feature.xml b/org.simantics.sysdyn.internal.feature/feature.xml
index 058bb3d26d0bc851342231a58cb982313b418bd5..0bd6c93cfb2d4202761cd0892f6e747424107777 100644 (file)
--- a/org.simantics.sysdyn.internal.feature/feature.xml
+++ b/org.simantics.sysdyn.internal.feature/feature.xml
@@ -2,19 +2,24 @@
 <feature\r
       id="org.simantics.sysdyn.internal"\r
       label="Simantics System Dynamics Internal Solver Feature"\r
-      version="1.8.2.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
+      Simantics System Dynamics product with custom internal solver only.\r
    </description>\r
 \r
-   <copyright url="http://www.example.com/copyright">\r
-      [Enter Copyright Description here.]\r
+   <copyright>\r
+      Copyright (c) 2007, 2010 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
    <includes\r
@@ -147,4 +152,11 @@
          install-size="0"\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
 </feature>\r

diff --git a/org.simantics.sysdyn.ontology/build.properties b/org.simantics.sysdyn.ontology/build.properties
index 098c3fd7f2ea994451b720b279f65e58c6683960..d1dd6667cec61fa530ddd983806ad908ef798193 100644 (file)
--- a/org.simantics.sysdyn.ontology/build.properties
+++ b/org.simantics.sysdyn.ontology/build.properties
@@ -13,6 +13,5 @@ source.. = src/
 output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
-               graphs/*.tg,\\r
                graph.tg\r
 src.includes = graph/\r

diff --git a/org.simantics.sysdyn.product.site.feature/feature.xml b/org.simantics.sysdyn.product.site.feature/feature.xml
index dba1b2c230fddc2cf05fe7879471ecb227938255..c2ab993f6a60eb8d356a042064bade98a3a77218 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/feature.xml
+++ b/org.simantics.sysdyn.product.site.feature/feature.xml
@@ -21,4 +21,8 @@
          id="org.simantics.sysdyn"\r
          version="0.0.0"/>\r
 \r
+   <includes\r
+         id="org.simantics.om"\r
+         version="0.0.0"/>\r
+\r
 </feature>\r

diff --git a/org.simantics.sysdyn.ui/sysdyn-with-openmodelica.product b/org.simantics.sysdyn.ui/sysdyn-with-openmodelica.product
new file mode 100644 (file)
index 0000000..c163639
--- /dev/null
+++ b/org.simantics.sysdyn.ui/sysdyn-with-openmodelica.product
@@ -0,0 +1,128 @@
+<?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.SysdynWithOpenModelica" id="org.simantics.sysdyn.ui.product" application="org.simantics.workbench.application" version="1.9.1" useFeatures="true" includeLaunchers="true">\r
+\r
+   <aboutInfo>\r
+      <image path="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\r
+      <text>\r
+         %about.text\r
+      </text>\r
+   </aboutInfo>\r
+\r
+   <configIni use="default">\r
+   </configIni>\r
+\r
+   <launcherArgs>\r
+      <programArgs>-fixerrors
+--launcher.XXMaxPermSize 192m
+-data @noDefault\r
+      </programArgs>\r
+      <vmArgs>-ea  -Xmx768M -XX:MaxPermSize=192m -Xshare:off -Dorg.simantics.undo.enabled=true\r
+      </vmArgs>\r
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
+      </vmArgsMac>\r
+      <vmArgsWin>-Dorg.osgi.framework.os.name=win32\r
+      </vmArgsWin>\r
+   </launcherArgs>\r
+\r
+   <windowImages i16="/org.simantics.sysdyn.ui/icons/simantics_sysdyn16.png" i32="/org.simantics.sysdyn.ui/icons/simantics_sysdyn32.png" i48="/org.simantics.sysdyn.ui/icons/simantics_sysdyn48.png" i64="/org.simantics.sysdyn.ui/icons/simantics_sysdyn64.png" i128="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\r
+\r
+   <splash\r
+      location="org.simantics.sysdyn.ui" />\r
+   <launcher name="Simantics-Sysdyn">\r
+      <solaris/>\r
+      <win useIco="false">\r
+         <bmp/>\r
+      </win>\r
+   </launcher>\r
+\r
+   <vm>\r
+      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>\r
+   </vm>\r
+\r
+   <license>\r
+        <url>http://www.eclipse.org/legal/epl-v10.html</url>\r
+        <text>\r
+   Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+&quot;Contribution&quot; means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+&quot;Contributor&quot; means any person or entity that distributes the Program.
+
+&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.\r
+         </text>\r
+   </license>\r
+\r
+   <plugins>\r
+   </plugins>\r
+\r
+   <features>\r
+      <feature id="org.simantics.sysdyn" version="1.9.1.qualifier"/>\r
+   </features>\r
+\r
+\r
+</product>\r

diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.ui/sysdyn.product
index 153d23818942576735050d50f4bab7af4497537d..daf0fd4647f2e531312a9993f7145480656cf6ad 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.9" useFeatures="true" includeLaunchers="true">\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.9.1" useFeatures="true" includeLaunchers="true">\r
 \r
    <aboutInfo>\r
       <image path="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\r
@@ -16,13 +16,13 @@
    <launcherArgs>\r
       <programArgs>-fixerrors
 --launcher.XXMaxPermSize 192m
--data @noDefault
+-data @noDefault\r
       </programArgs>\r
-      <vmArgs>-ea  -Xmx768M -XX:MaxPermSize=192m -Xshare:off -Dorg.simantics.undo.enabled=true
+      <vmArgs>-ea  -Xmx768M -XX:MaxPermSize=192m -Xshare:off -Dorg.simantics.undo.enabled=true\r
       </vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
       </vmArgsMac>\r
-      <vmArgsWin>-Dorg.osgi.framework.os.name=win32
+      <vmArgsWin>-Dorg.osgi.framework.os.name=win32\r
       </vmArgsWin>\r
    </launcherArgs>\r
 \r
@@ -121,7 +121,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.9.0.qualifier"/>\r
+      <feature id="org.simantics.sysdyn.internal" version="1.9.1.qualifier"/>\r
    </features>\r
 \r
 \r