Removed old OpenModelica 1.8.0 (refs #2925)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@24827 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 e0a1231839b115e3a8138233e328a36699a5c158..6445ce4057d3a9f71076d06b0d528e1952f2d60e 100644 (file)
--- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
@@ -106,7 +106,7 @@ public class ModelicaManager {
                     if(entry != null) {\r
                         URL fileURL = FileLocator.toFileURL(entry);\r
                         File root = new File( URLDecoder.decode(fileURL.getPath(), "UTF-8") );\r
-                        File f = new File(root, "OpenModelica1.8.0");\r
+                        File f = new File(root, "OpenModelica1.8.1");\r
                         return f;\r
                     }\r
                 }\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Function.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Function.java
index 5924383963da5fdadca91373e2b73e625858abf3..7210ddc1b17239ea655efe76be34a5f49ac67cd5 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Function.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Function.java
@@ -59,9 +59,13 @@ public class Function {
      */\r
     @UpdateMethod\r
     public boolean update(ReadGraph g, Resource r) throws DatabaseException {\r
+        hasTimeReference = false;\r
+\r
         String code = g.getPossibleRelatedValue(r, SysdynResource.getInstance(g).SysdynModelicaFunction_modelicaFunctionCode);\r
+        if(code == null)\r
+               return true;\r
+        \r
         String[] elements = code.split("[\\+\\-\\*\\/\\(\\)\\[\\]\\{\\}=;\\s]");\r
-        hasTimeReference = false;\r
         for(String element : elements) {\r
             if("time".equals(element)) {\r
                 hasTimeReference = true;\r