Changeset 142 in tmcsimulator-scriptbuilder

Timestamp:

01/04/2018 09:29:09 AM (8 years ago)

Author:

bmcguffin

Message:

Band-aid fix for defect #68. CadData? object in TimeSlice? is now initialized in constructor.

Location:

trunk/src/scriptbuilder/structures

Files:

• CadData.java (modified) (1 diff)
• TimeSlice.java (modified) (3 diffs)

trunk/src/scriptbuilder/structures/CadData.java

@@ -18 +18 @@
     public TimeSlice tSlice;
 
-    public String Header_Type = "";
+    public String Header_Type = "DEFAULT";
 
     public String Header_Beat = "";

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -23 +23 @@
 {
 
+    /**
+     * Cad data object for this timeslice. Can be overwritten by call from
+     * parent incident.
+     */
     CadData cadData = null;
 
@@ -49 +53 @@
         events = new ArrayList<I_ScriptEvent>();
         thisIncident = inc;
+        cadData = new CadData();
     }
 
@@ -221 +226 @@
         output += XMLWriter.openTag(ELEMENT.INCIDENT.tag + " LogNum=\"" + thisIncident.number + "\"");
         output += thisIncident.name + XMLWriter.closeTag(ELEMENT.INCIDENT.tag);
-        output += XMLWriter.emptyTag(ELEMENT.COLOR.tag 
+        output += XMLWriter.emptyTag(ELEMENT.COLOR.tag
                 + " r=\"" + thisIncident.color.getRed() + "\""
                 + " g=\"" + thisIncident.color.getGreen() + "\""