Changeset 170 in tmcsimulator-scriptbuilder

Timestamp:

12/18/2019 02:13:40 PM (6 years ago)

Author:

sdanthin

Message:

MyScriptHandler?.java modified to use the addNewEventFromXML in place of addNewEvent

File:

• trunk/src/scriptbuilder/structures/MyScriptHandler.java (modified) (16 diffs)

trunk/src/scriptbuilder/structures/MyScriptHandler.java

@@ -624 +624 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.ACTIVITY_LOG_EVALUATION)
@@ -630 +630 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.AGY && docPosition.peek() == ELEMENT.GENERAL)
@@ -693 +693 @@
                 ((AudioEvent) newEvent).audioPath = audioPath;
                 ((AudioEvent) newEvent).length = audioLength;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.CAD_EVALUATION)
@@ -699 +699 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.CAD_INCIDENT_EVENT)
@@ -710 +710 @@
                     if (!(((CADEvent) newEvent).detail.equals("")))
                     {
-                        currInc.addNewEvent(newEvent, (int) currentEventTime);
+                        currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
                     }
                 }
@@ -719 +719 @@
                 newEvent = eventMap.remove(currentElement);
                 ((CCTVEvent) newEvent).message = pcData.remove(ELEMENT.CCTV_INFO);
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.CHP_RADIO)
@@ -725 +725 @@
                 newEvent = eventMap.remove(currentElement);
                 ((CHPRadioEvent) newEvent).radioFile = CHPRadiofile;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
 
@@ -738 +738 @@
                 }
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.CMS_LINE)
@@ -762 +762 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.INSTRUCTOR)
@@ -802 +802 @@
                 newEvent = eventMap.remove(currentElement);
                 ((MaintenanceRadioEvent) newEvent).message = pcData.remove(ELEMENT.MAINTENANCE_RADIO);
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.MASTER_INC_NUM)
@@ -825 +825 @@
                     ((ParamicsEvent) newEvent).type = pcData.remove(ELEMENT.Incident_type);
                 }
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.RADIO_EVALUATION)
@@ -831 +831 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.SCRIPT_EVENT)
@@ -858 +858 @@
                 newEvent = eventMap.remove(currentElement);
                 ((TMTRadioEvent) newEvent).message = pcData.remove(ELEMENT.TMT_RADIO);
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.TELEPHONE)
             {
                 newEvent = eventMap.remove(currentElement);
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.TOW)
@@ -872 +872 @@
                 ((TowEvent) newEvent).towConfNum = TowConfNum;
                 ((TowEvent) newEvent).towPubNum = TowPubNum;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.TYPE && docPosition.peek() == ELEMENT.ADDITIONAL_INFO)
@@ -889 +889 @@
                 ((UnitEvent) newEvent).unitStatus = UnitStatus;
                 ((UnitEvent) newEvent).unitNum = UnitNum;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.WITNESS)
@@ -897 +897 @@
                 ((WitnessEvent) newEvent).witnessName = WitnessName;
                 ((WitnessEvent) newEvent).witnessNum = WitnessNum;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }