Changeset 47 in tmcsimulator-scriptbuilder

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.

Location:

trunk/src/scriptbuilder/structures

Files:

• CadData.java (modified) (2 diffs)
• ScriptEvent.java (modified) (5 diffs)
• ScriptIncident.java (modified) (1 diff)
• TimeSlice.java (modified) (1 diff)
• events/CADEvent.java (modified) (2 diffs)
• events/ParamicsEvent.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/CadData.java

@@ -141 +141 @@
 
             output += XMLWriter.simpleTag(Header_Beat, ELEMENT.Beat);
-            
+
             output += XMLWriter.simpleTag(Header_TruncLoc, ELEMENT.TruncLoc);
-            
+
             output += XMLWriter.simpleTag(Header_FullLoc, ELEMENT.FullLoc);
 
@@ -184 +184 @@
     }
 
+    public boolean hasCadData()
+    {
+        return hasHeaderInfo() || hasLocation() || hasAdditionalInfo()
+                || !Master_Inc_Num.equals("") || !P.equals("") || !Agy.equals("")
+                || locInfo.size() > 0;
+    }
 }

trunk/src/scriptbuilder/structures/ScriptEvent.java

@@ -28 +28 @@
         return this.type.compareTo(o.type);
     }
-    
+
     @Override
     public int getLength()
@@ -42 +42 @@
     public static enum ScriptEventType
     {
+
         CAD_EVENT("CAD"),
         UNIT_EVENT("Unit"),
+        TOW_EVENT("Tow"),
+        WITNESS_EVENT("Witness"),
         AUDIO_EVENT("Audio"),
         CCTV_EVENT("CCTV"),
         CHP_RADIO_EVENT("CHPRadio"),
         PARAMICS_EVENT("Paramics"),
-        TOW_EVENT("Tow"),
-        WITNESS_EVENT("Witness"),
         TELEPHONE_EVENT("Telephone"),
-        MAINTENANCE_RADIO_EVENT("MaintenanceRadio"),
-        TMT_RADIO_EVENT("TMTRadio"),
         CAD_EVAL_EVENT("CADEval"),
         ATMS_EVAL_EVENT("ATMSEval"),
@@ -58 +57 @@
         ACTIVITY_LOG_EVAL_EVENT("ActivityLogEval"),
         FACILITATOR_EVAL_EVENT("FacilitatorEval"),
-        RADIO_EVAL_EVENT("RadioEval");
+        RADIO_EVAL_EVENT("RadioEval"),
+        MAINTENANCE_RADIO_EVENT("MaintenanceRadio"),
+        TMT_RADIO_EVENT("TMTRadio");
 
         /**
@@ -128 +129 @@
         return this.type.toString() + " - [Event Description]";
     }
-    
+
     public static I_ScriptEvent factoryByType(ScriptEventType t)
     {
-        switch(t)
+        switch (t)
         {
             case AUDIO_EVENT:
@@ -169 +170 @@
             default:
                 return new TelephoneEvent();
-        }            
+        }
     }
 }

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -240 +240 @@
     {
         String output = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
-        output += "<!DOCTYPE TMC_SCRIPT SYSTEM \"script.dtd\">";
+        output += "<!DOCTYPE TMC_SCRIPT SYSTEM \"script.dtd\">\n";
         output += XMLWriter.openTag(ELEMENT.TMC_SCRIPT.tag + " title=\"" + this.script.title + "\"");
 

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())

trunk/src/scriptbuilder/structures/events/CADEvent.java

@@ -6 +6 @@
 package scriptbuilder.structures.events;
 
+import java.util.StringTokenizer;
 import scriptbuilder.structures.ELEMENT;
 import scriptbuilder.structures.I_XML_Writable;
@@ -32 +33 @@
     public String toXML()
     {
-        String output = XMLWriter.simpleTag(detail, ELEMENT.DETAIL);
+        StringTokenizer tok = new StringTokenizer(detail, "\n");
+        String output = "";
+        while (tok.hasMoreTokens())
+        {
+            output += XMLWriter.simpleTag(tok.nextToken(), ELEMENT.DETAIL);
+        }
         return output;
     }

trunk/src/scriptbuilder/structures/events/ParamicsEvent.java

@@ -33 +33 @@
 
     public String locationID = "";
+
     @Override
     public String toXML()
@@ -40 +41 @@
         output += XMLWriter.simpleTag(status, ELEMENT.Status);
 
-        output += XMLWriter.simpleTag(type, ELEMENT.Incident_type);
+        if (!type.equals(""))
+        {
+            output += XMLWriter.simpleTag(type, ELEMENT.Incident_type);
+        }
 
         for (Integer lane : laneNums)
         {
-            output += XMLWriter.simpleTag(""+lane, ELEMENT.Lane_number);
+            output += XMLWriter.simpleTag("" + lane, ELEMENT.Lane_number);
         }
         output += XMLWriter.closeTag(ELEMENT.PARAMICS.tag);