Index: /trunk/src/scriptbuilder/structures/MyScriptHandler.java
===================================================================
--- /trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 145)
+++ /trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 170)
@@ -624,5 +624,5 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.ACTIVITY_LOG_EVALUATION)
@@ -630,5 +630,5 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.AGY && docPosition.peek() == ELEMENT.GENERAL)
@@ -693,5 +693,5 @@
                 ((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,5 +699,5 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.CAD_INCIDENT_EVENT)
@@ -710,5 +710,5 @@
                     if (!(((CADEvent) newEvent).detail.equals("")))
                     {
-                        currInc.addNewEvent(newEvent, (int) currentEventTime);
+                        currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
                     }
                 }
@@ -719,5 +719,5 @@
                 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,5 +725,5 @@
                 newEvent = eventMap.remove(currentElement);
                 ((CHPRadioEvent) newEvent).radioFile = CHPRadiofile;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
 
@@ -738,5 +738,5 @@
                 }
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.CMS_LINE)
@@ -762,5 +762,5 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.INSTRUCTOR)
@@ -802,5 +802,5 @@
                 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,5 +825,5 @@
                     ((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,5 +831,5 @@
                 newEvent = eventMap.remove(currentElement);
 
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.SCRIPT_EVENT)
@@ -858,10 +858,10 @@
                 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,5 +872,5 @@
                 ((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,5 +889,5 @@
                 ((UnitEvent) newEvent).unitStatus = UnitStatus;
                 ((UnitEvent) newEvent).unitNum = UnitNum;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }
             else if (currentElement == ELEMENT.WITNESS)
@@ -897,5 +897,5 @@
                 ((WitnessEvent) newEvent).witnessName = WitnessName;
                 ((WitnessEvent) newEvent).witnessNum = WitnessNum;
-                currInc.addNewEvent(newEvent, (int) currentEventTime);
+                currInc.addNewEventFromXML(newEvent, (int) currentEventTime);
             }