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

Timestamp:

08/07/2017 04:20:08 PM (9 years ago)

Author:

bmcguffin

Message:

Added file: XMLWriter, in package Scriptbuilder.structures. It holds static methods which ither classes that implement I_XML_Writable may find useful. Also restructured the toXML method of many classes to utilize this new class.

File:

• trunk/src/scriptbuilder/structures/TimeSlice.java (modified) (4 diffs)

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -22 +22 @@
 public class TimeSlice implements Comparable, I_XML_Writable
 {
+
     CadData cadData = null;
 
@@ -213 +214 @@
 
         System.out.println("Seconds:: " + seconds);
-        String output = openTag(ELEMENT.SCRIPT_EVENT.tag);
+        String output = XMLWriter.openTag(ELEMENT.SCRIPT_EVENT.tag);
         SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
         df.setTimeZone(TimeZone.getTimeZone("GMT"));
-        output += openTag(ELEMENT.TIME_INDEX.tag) + df.format(new Date(seconds * 1000))
-                + closeTag(ELEMENT.TIME_INDEX.tag);
-
-        output += openTag(ELEMENT.INCIDENT.tag + " LogNum=\"" + thisIncident.number + "\"");
-        output += thisIncident.name + closeTag(ELEMENT.INCIDENT.tag);
-
-        output += openTag(ELEMENT.CAD_DATA.tag);
+        output += XMLWriter.openTag(ELEMENT.TIME_INDEX.tag) + df.format(new Date(seconds * 1000))
+                + XMLWriter.closeTag(ELEMENT.TIME_INDEX.tag);
+
+        output += XMLWriter.openTag(ELEMENT.INCIDENT.tag + " LogNum=\"" + thisIncident.number + "\"");
+        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())
         {
-            output += openTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
+
             for (I_ScriptEvent ev : eventsCopy)
             {
@@ -241 +244 @@
             eventsCopy = eventsCopy2;
 
-            output += closeTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
-        }
-        output += closeTag(ELEMENT.CAD_DATA.tag);
+        }
+        output += XMLWriter.closeTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
+
+        output += XMLWriter.closeTag(ELEMENT.CAD_DATA.tag);
+
+        if (cadData.hasGeneralInfo())
+        {
+            output += XMLWriter.openTag(ELEMENT.GENERAL_INFO.tag);
+
+            output += XMLWriter.simpleTag(cadData.General_Title, ELEMENT.TITLE);
+
+            output += XMLWriter.simpleTag(cadData.General_Text, ELEMENT.TEXT);
+
+            output += XMLWriter.closeTag(ELEMENT.GENERAL_INFO.tag);
+
+        }
 
         for (I_ScriptEvent ev : eventsCopy)
@@ -253 +269 @@
             }
         }
-        output += closeTag(ELEMENT.SCRIPT_EVENT.tag);
+        output += XMLWriter.closeTag(ELEMENT.SCRIPT_EVENT.tag);
         System.out.println(output);
         return output;
-    }
-
-    @Override
-    public String openTag(String s)
-    {
-        return "<" + s + ">";
-    }
-
-    @Override
-    public String closeTag(String s)
-    {
-        return "</" + s + ">\n";
-    }
-
-    @Override
-    public String emptyTag(String s)
-    {
-        return "<" + s + "/>\n";
     }