Use default input value also if a dependency from module to input exists, but referen...

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
index f1b60899db2fba4c42d781c344fbc9c532ecc2f0..bd4629532745bf62144434af94bed615a137a04b 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************\r
- * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Copyright (c) 2007, 2011 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
@@ -73,7 +73,7 @@ public class ModelicaWriter {
                 inputs.add((Input)element);\r
             } else if (element instanceof Enumeration) {\r
                 enumerations.add((Enumeration)element);\r
-            } else if (element instanceof Dependency && ((Dependency)element).refersTo() != null) {\r
+            } else if (element instanceof Dependency) {\r
                 Dependency dependency = (Dependency)element;\r
                 if(dependency.getHead() instanceof Module) {\r
                     outputDependencies.add(dependency);\r
@@ -141,7 +141,10 @@ public class ModelicaWriter {
             Input variable = (Input)dependency.getHead();\r
             Module module = (Module)dependency.getTail();\r
             Variable reference = (Variable)dependency.refersTo();\r
-            b.append("    " + variable.getName() + " = " + module.getName() + "." + reference.getName() + ";\n");\r
+            if(reference != null)\r
+               b.append("    " + variable.getName() + " = " + module.getName() + "." + reference.getName() + ";\n");\r
+            else\r
+               b.append("    " + variable.getName() + " = " + variable.getDefaultInputValue() + ";\n");\r
         }\r
 \r
         b.append("// Outputs\n");\r
@@ -149,8 +152,10 @@ public class ModelicaWriter {
             Variable variable = (Variable)dependency.getTail();\r
             Module module = (Module)dependency.getHead();\r
             Input reference = (Input)dependency.refersTo();\r
-            b.append("    " + module.getName() + "." + reference.getName() + " = " + variable.getName() + ";\n");\r
-            moduleInputs.get(module.getName()).remove(reference);\r
+            if(reference != null) {\r
+               b.append("    " + module.getName() + "." + reference.getName() + " = " + variable.getName() + ";\n");\r
+               moduleInputs.get(module.getName()).remove(reference);\r
+            }\r
         }\r
 \r
         b.append("// Default values for inputs in modules\n");\r