Changeset 47 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/TimeSlice.java

Timestamp:

08/08/2017 09:36:51 AM (9 years ago)

Author:

bmcguffin

Message:

Updated toXML behaviors for several classes to bring final adjustments in line with desired output.

File:

• trunk/src/scriptbuilder/structures/TimeSlice.java (modified) (1 diff)

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -223 +223 @@
         output += thisIncident.name + XMLWriter.closeTag(ELEMENT.INCIDENT.tag);
 
-        output += XMLWriter.openTag(ELEMENT.CAD_DATA.tag);
-        output += cadData.toXML();
-        output += XMLWriter.openTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
-        if (containsCADIncidentEvent())
-        {
-
-            for (I_ScriptEvent ev : eventsCopy)
-            {
-                if (ev instanceof I_XML_Writable && isCADIncidentEvent(ev))
+        if (cadData.hasCadData() || containsCADIncidentEvent())
+        {
+            output += XMLWriter.openTag(ELEMENT.CAD_DATA.tag);
+            output += cadData.toXML();
+
+            if (containsCADIncidentEvent())
+            {
+                output += XMLWriter.openTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
+                for (I_ScriptEvent ev : eventsCopy)
                 {
-                    I_XML_Writable ex = (I_XML_Writable) ev;
-                    output += ex.toXML();
+                    if (ev instanceof I_XML_Writable && isCADIncidentEvent(ev))
+                    {
+                        I_XML_Writable ex = (I_XML_Writable) ev;
+                        output += ex.toXML();
+                    }
+                    else
+                    {
+                        eventsCopy2.add(ev);
+                    }
                 }
-                else
-                {
-                    eventsCopy2.add(ev);
-                }
-            }
-
-            eventsCopy = eventsCopy2;
-
-        }
-        output += XMLWriter.closeTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
-
-        output += XMLWriter.closeTag(ELEMENT.CAD_DATA.tag);
+
+                eventsCopy = eventsCopy2;
+                output += XMLWriter.closeTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
+            }
+
+            output += XMLWriter.closeTag(ELEMENT.CAD_DATA.tag);
+        }
 
         if (cadData.hasGeneralInfo())