Changed the OpenModelica version to 1.9.2 (refs #5759).

Renamed the OpenModelica plugin, since the full path in an installation becomes otherwise to long.
Changed the default solver of Sysdyn to internal.

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

diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
index ae40d665e7a25ca922a3148b16d87047cc40e8ab..09cd5adbe27fed94a9351a6d6f1717317efe5a6c 100644 (file)
--- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************\r
- * Copyright (c) 2010, 2012 Association for Decentralized Information Management in\r
+ * Copyright (c) 2010, 2012, 2015 Association for Decentralized Information Management in\r
  * Industry THTH ry.\r
  * All rights reserved. This program and the accompanying materials\r
  * are made available under the terms of the Eclipse Public License v1.0\r
@@ -61,7 +61,7 @@ import org.xml.sax.SAXException;
  */\r
 public class ModelicaManager {\r
 \r
-       private static final String OM_BUILTIN = "OpenModelica1.9.0";\r
+       private static final String OM_BUILTIN = "OM192";\r
 \r
        public enum OSType {\r
                APPLE, LINUX, SUN, WINDOWS, UNKNOWN\r
@@ -155,7 +155,7 @@ public class ModelicaManager {
        }\r
        \r
        public static String getOMVersion(File home) {\r
-               return getProcessOutput(runOMC(home, home, "++v"));\r
+               return getProcessOutput(runOMC(home, home, "--version"));\r
        }\r
        \r
        public static String getDefaultOMVersion() {\r
@@ -217,7 +217,7 @@ public class ModelicaManager {
        }\r
 \r
        public static File getBuiltinOMHome() {\r
-               Bundle bundle = Platform.getBundle("org.simantics.openmodelica.win32");\r
+               Bundle bundle = Platform.getBundle("org.simantics.om.win32");\r
                if (bundle != null) {\r
                        try {\r
                                File omHome = new File(FileLocator.getBundleFile(bundle), OM_BUILTIN);\r
@@ -643,10 +643,10 @@ public class ModelicaManager {
 \r
                        // Create simulation files from the full description\r
                        ArrayList<String> parameters = new ArrayList<String>();\r
-                       parameters.add("+s");\r
+                       parameters.add("-s");\r
                        parameters.add(simulationLocation.fullModelFile.getAbsolutePath());\r
 \r
-                       Process process = runOMC(simulationLocation.omHome, simulationLocation.fullModelDir, "+s", simulationLocation.fullModelFile.getAbsolutePath());\r
+                       Process process = runOMC(simulationLocation.omHome, simulationLocation.fullModelDir, "-s", simulationLocation.fullModelFile.getAbsolutePath());\r
 \r
                        process.waitFor();\r
 \r

diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml
index fe512f8ff3594e922b867e4b6763c08d9b5c0367..dd9cd543e941f084a501e630031b9eb4f1b9dc29 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.8.0.qualifier"\r
+      version="1.9.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r
@@ -106,7 +106,7 @@
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.openmodelica.win32"\r
+         id="org.simantics.om.win32"\r
          os="win32"\r
          download-size="0"\r
          install-size="0"\r

diff --git a/org.simantics.sysdyn.ontology/.classpath b/org.simantics.sysdyn.ontology/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b1dabee38291b97f08cc3a18bee4e65b1e550530 100644 (file)
--- a/org.simantics.sysdyn.ontology/.classpath
+++ b/org.simantics.sysdyn.ontology/.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.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs b/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs
index 888b17ed745a53fbd10620d96246b290a25fed46..6e070f4fd3368e1367df15f02520c6d8d9283985 100644 (file)
--- a/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Thu Jul 22 15:15:41 EEST 2010\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.sysdyn.ontology/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
index dfa33be962975ac71ad3b6f176834b3e90e4a389..277f2c58a28ba3c73fe36e6b87b144d27317b69d 100644 (file)
--- a/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
@@ -20,6 +20,6 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.silk.ontology;bundle-version="1.0.0",
  org.simantics.spreadsheet.ontology;bundle-version="1.1.0",
  org.simantics.workbench.ontology;bundle-version="1.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.simantics.sysdyn
 Bundle-Vendor: VTT Technical Reserarch Centre of Finland

diff --git a/org.simantics.sysdyn.ui/.classpath b/org.simantics.sysdyn.ui/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b1dabee38291b97f08cc3a18bee4e65b1e550530 100644 (file)
--- a/org.simantics.sysdyn.ui/.classpath
+++ b/org.simantics.sysdyn.ui/.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.sysdyn.ui/.project b/org.simantics.sysdyn.ui/.project
index 2ebd5691cae413e16caf016e7c622f4df37d3296..785f1265ebfa075f2e7d43ff5dfa05f4806a94a5 100644 (file)
--- a/org.simantics.sysdyn.ui/.project
+++ b/org.simantics.sysdyn.ui/.project
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.simantics.sysdyn.ui</name>\r
-       <comment></comment>\r
+       <comment>JavaCC Nature</comment>\r
        <projects>\r
        </projects>\r
        <buildSpec>\r
+               <buildCommand>\r
+                       <name>sf.eclipse.javacc.javaccbuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
                        <arguments>\r
@@ -24,5 +29,6 @@
        <natures>\r
                <nature>org.eclipse.pde.PluginNature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
+               <nature>sf.eclipse.javacc.javaccnature</nature>\r
        </natures>\r
 </projectDescription>\r

diff --git a/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs b/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..838bd9d69424290f7e947b867a3b4381e756dad8 100644 (file)
--- a/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,11 @@
 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.codegen.unusedLocal=preserve\r
+org.eclipse.jdt.core.compiler.compliance=1.7\r
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate\r
+org.eclipse.jdt.core.compiler.debug.localVariable=generate\r
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate\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.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 67255fcb519ebe5fbbf62f8027a1e36e3a74afbc..d334c39dd090aa8a3fc18016be48bee578f384ae 100644 (file)
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simantics System Dynamics UI
 Bundle-SymbolicName: org.simantics.sysdyn.ui;singleton:=true
-Bundle-Version: 1.8.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 1.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.scenegraph;bundle-version="0.9.0",
  org.junit4;bundle-version="4.5.0";resolution:=optional,

diff --git a/org.simantics.sysdyn.ui/plugin.properties b/org.simantics.sysdyn.ui/plugin.properties
index 150b0012cd62ca591f1f7d483bd104fbee813827..ad16535d5bcfcd8e0ca67371fc89cfcabbaccf20 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.properties
+++ b/org.simantics.sysdyn.ui/plugin.properties
@@ -1,6 +1,6 @@
 about.text = Simantics System Dynamics\n\\r
 \n\\r
-Version 1.8.3\n\\r
+Version 1.9\n\\r
 \n\\r
 Copyright (c) 2014 Association for Decentralized Information Management in Industry THTH ry.\n\\r
 \n\\r

diff --git a/org.simantics.sysdyn.ui/plugin_customization.ini b/org.simantics.sysdyn.ui/plugin_customization.ini
index 2d6b595d262a44327d7f47450a0aa34618efbd91..f2954cf62e98c5b1fff53fa89d726cc716644f54 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin_customization.ini
+++ b/org.simantics.sysdyn.ui/plugin_customization.ini
@@ -1,4 +1,4 @@
 org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false\r
 org.eclipse.ui/DOCK_PERSPECTIVE_BAR=right\r
 \r
-org.simantics.sysdyn.solver.preferences/SOLVER_TYPE=OPENMODELICA
\ No newline at end of file
+org.simantics.sysdyn.solver.preferences/SOLVER_TYPE=INTERNAL
\ No newline at end of file

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java
index af438d9a9cf470051a744ecbd68c2ba25994f577..0ab5acee7c6a6a1d3e767f5efdf9402c2b5dde03 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************\r
- * Copyright (c) 2013 Association for Decentralized Information Management in\r
+ * Copyright (c) 2013, 2015 Association for Decentralized Information Management in\r
  * Industry THTH ry.\r
  * All rights reserved. This program and the accompanying materials\r
  * are made available under the terms of the Eclipse Public License v1.0\r
@@ -138,7 +138,7 @@ public class ModelicaPreferencePage extends FieldEditorPreferencePage implements
                        }\r
 \r
                        private void updatePath(String newValue) {\r
-                               if((installed != null && newValue.equals(installed.getAbsolutePath()) ||  newValue.equals(builtIn.getAbsolutePath()))) {\r
+                               if((installed != null && newValue.equals(installed.getAbsolutePath())) || (builtIn != null && newValue.equals(builtIn.getAbsolutePath()))) {\r
                                        path.setStringValue(newValue);\r
                                        path.setEnabled(false, getFieldEditorParent());\r
                                } else {\r

diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.ui/sysdyn.product
index 7558ac46bea26ae31f17971beeb4c45892d559f1..153d23818942576735050d50f4bab7af4497537d 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.8.3" 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" useFeatures="true" includeLaunchers="true">\r
 \r
    <aboutInfo>\r
       <image path="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\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.8.0.qualifier"/>\r
+      <feature id="org.simantics.sysdyn" version="1.9.0.qualifier"/>\r
    </features>\r
 \r
 \r

diff --git a/org.simantics.sysdyn/.classpath b/org.simantics.sysdyn/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b1dabee38291b97f08cc3a18bee4e65b1e550530 100644 (file)
--- a/org.simantics.sysdyn/.classpath
+++ b/org.simantics.sysdyn/.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.sysdyn/.settings/org.eclipse.jdt.core.prefs b/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs
index 785aae6f642213c1353ba28d59349d5b11c5adc8..009f2581cc706d8de08889b461acb40c92cbf749 100644 (file)
--- a/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Mon Nov 16 15:37:44 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.sysdyn/META-INF/MANIFEST.MF b/org.simantics.sysdyn/META-INF/MANIFEST.MF
index 9c5a86f754bc29a2e8c5d69f7ef25087c283938d..7f5330ed6f6b1e038ce689aa1b7b955b5d5036dc 100644 (file)
--- a/org.simantics.sysdyn/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simantics System Dynamics
 Bundle-SymbolicName: org.simantics.sysdyn;singleton:=true
-Bundle-Version: 1.8.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 1.9.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.simantics.objmap;bundle-version="0.1.0",
  org.simantics.db;bundle-version="0.6.2",
  org.simantics.modelica;bundle-version="1.0.0",

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
index 53aec601544946a7ca15b42d9dcb5c7e64799577..e4f589ac61b3d310813b9480632d8bcd2279df76 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************\r
- * Copyright (c) 2007, 2012 Association for Decentralized Information Management in\r
+ * Copyright (c) 2007, 2012, 2015 Association for Decentralized Information Management in\r
  * Industry THTH ry.\r
  * All rights reserved. This program and the accompanying materials\r
  * are made available under the terms of the Eclipse Public License v1.0\r
@@ -155,7 +155,7 @@ public class SysdynGameExperiment extends SysdynGameExperimentBase {
                if(simulationLocation != null && !canceled) {\r
                        // Load fmu and initialize it for simulation\r
                        try {\r
-                               if (false && !fortranLibrariesLoaded) { // Enable this when we update from OpenModelica 1.9.0beta4!\r
+                               if (!fortranLibrariesLoaded) { // Enable this when we update from OpenModelica 1.9.0beta4!\r
                                        File omDir = ModelicaManager.getOMHome();\r
                                        File mingw = new File(omDir, "MinGW");\r
                                        File mbin = new File(mingw, "bin");\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java
index 65ec03b9f53132ecfa19b4f7951062fdd9e2500e..a38a3ce41f69c62fb0d07be8cf8536df4a0aafdd 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java
@@ -20,7 +20,7 @@ public class SolverSettings {
                if (type == null) {\r
                        // solver type is not set, should not happen since the default \r
                        // value should be in plugin_customization.ini\r
-                       return SolverType.OPENMODELICA;\r
+                       return SolverType.INTERNAL;\r
                }\r
                if (SOLVER_TYPE_INTERNAL.equals(type)) {\r
                        return SolverType.INTERNAL;\r