Changeset 1576 for trunk

Timestamp:

07/11/12 17:05:11 (12 years ago)

Author:

wschamai

Message:

BUG FIX: coping of simulation experiment settings

File:

• trunk/modelicaml/org.openmodelica.modelicaml.helper/src/org/openmodelica/modelicaml/helper/impl/VeMGeneratorScenariosBased.java (modified) (1 diff)

trunk/modelicaml/org.openmodelica.modelicaml.helper/src/org/openmodelica/modelicaml/helper/impl/VeMGeneratorScenariosBased.java

@@ -722 +722 @@
                 String annotationString = "experiment(";
                 
-                if (startTime!= null) {annotationString = annotationString + "StartTime=" + startTime.toString() + ", "; }
-                if (stopTime!= null) {annotationString = annotationString + "StopTime=" + stopTime.toString() + ", "; }
+                if (startTime!= null && !((String)startTime).isEmpty()) {annotationString = annotationString + "StartTime=" + startTime.toString() + ", "; }
+                if (stopTime!= null && !((String)stopTime).isEmpty()) {annotationString = annotationString + "StopTime=" + stopTime.toString() + ", "; }
                 //if (numberOfIntervals!= null) {annotationString = annotationString + ", Output=" + numberOfIntervals.toString(); }
-                if (tolerance!= null) {annotationString = annotationString + "Tolerance=" + tolerance.toString(); }
+                if (tolerance!= null && !((String)tolerance).isEmpty()) {annotationString = annotationString + "Tolerance=" + tolerance.toString(); }
+                
+                if (annotationString.length() > 2 && annotationString.trim().endsWith(",")) {
+                    annotationString = annotationString.substring(0, annotationString.length() - 2);
+                }
                 
                 annotationString = annotationString + ")";