Changeset 37 in tmcsimulator-scriptbuilder

Timestamp:

08/03/2017 03:24:32 PM (9 years ago)

Author:

bmcguffin

Message:

Updated XML methods to more accurately export data.

Location:

trunk/src/scriptbuilder/structures

Files:

• MyScriptHandler.java (modified) (2 diffs)
• TimeSlice.java (modified) (1 diff)
• events/ATMSEvaluationEvent.java (modified) (1 diff)
• events/ActivityLogEvaluationEvent.java (modified) (1 diff)
• events/CADEvaluationEvent.java (modified) (1 diff)
• events/FacilitatorEvaluationEvent.java (modified) (1 diff)
• events/RadioEvaluationEvent.java (modified) (1 diff)

trunk/src/scriptbuilder/structures/MyScriptHandler.java

@@ -468 +468 @@
                     TMCTitle = "";
                 }
+                script.title = TMCTitle;
+                
             }
             else if (qName.equals(ELEMENT.TMT_RADIO.tag))
@@ -727 +729 @@
                     ((ParamicsEvent) newEvent).status = pcData.remove(ELEMENT.Status);
                 }
-                if (pcData.get(ELEMENT.Type) != null)
-                {
-                    ((ParamicsEvent) newEvent).type = pcData.remove(ELEMENT.Type);
+                if (pcData.get(ELEMENT.Incident_type) != null)
+                {
+                    ((ParamicsEvent) newEvent).type = pcData.remove(ELEMENT.Incident_type);
                 }
                 currInc.addNewEvent(newEvent, (int) currentEventTime);

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -291 +291 @@
         return ev instanceof AudioEvent || ev instanceof UnitEvent
                 || ev instanceof ParamicsEvent || ev instanceof TowEvent
-                || ev instanceof WitnessEvent;
+                || ev instanceof WitnessEvent || ev instanceof CADEvent;
     }
 }

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

@@ -49 +49 @@
         expectedAction.remove(index);
     }
-    
+
     @Override
     public String toXML()
     {
         String output = openTag(ELEMENT.ATMS_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.ATMS_EVALUATION.tag);
-        
+
         return output;
     }

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

@@ -54 +54 @@
     {
         String output = openTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
         

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

@@ -54 +54 @@
     {
         String output = openTag(ELEMENT.CAD_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.CAD_EVALUATION.tag);
         

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

@@ -54 +54 @@
     {
         String output = openTag(ELEMENT.FACILITATOR_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.FACILITATOR_EVALUATION.tag);
         

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

@@ -55 +55 @@
     {
         String output = openTag(ELEMENT.RADIO_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.RADIO_EVALUATION.tag);