Index: trunk/src/scriptbuilder/structures/TimeSlice.java
===================================================================
--- trunk/src/scriptbuilder/structures/TimeSlice.java	(revision 176)
+++ trunk/src/scriptbuilder/structures/TimeSlice.java	(revision 203)
@@ -225,14 +225,14 @@
         }
 
-        String output = XMLWriter.openTag(ELEMENT.SCRIPT_EVENT.tag);
+        String output = XMLBuilder.openTag(ELEMENT.SCRIPT_EVENT.tag);
         SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
         df.setTimeZone(TimeZone.getTimeZone("GMT"));
         // Build the output string, starting with a newline (ticket #203)
-        output += "\n" + 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.emptyTag(ELEMENT.COLOR.tag
+        output += "\n" + XMLBuilder.openTag(ELEMENT.TIME_INDEX.tag) + df.format(new Date(seconds * 1000))
+                + XMLBuilder.closeTag(ELEMENT.TIME_INDEX.tag);
+
+        output += XMLBuilder.openTag(ELEMENT.INCIDENT.tag + " LogNum=\"" + thisIncident.number + "\"");
+        output += thisIncident.name + XMLBuilder.closeTag(ELEMENT.INCIDENT.tag);
+        output += XMLBuilder.emptyTag(ELEMENT.COLOR.tag
                 + " r=\"" + thisIncident.color.getRed() + "\""
                 + " g=\"" + thisIncident.color.getGreen() + "\""
@@ -241,5 +241,5 @@
         if ((cadData != null && cadData.hasCadData()) || containsCADIncidentEvent())
         {
-            output += XMLWriter.openTag(ELEMENT.CAD_DATA.tag);
+            output += XMLBuilder.openTag(ELEMENT.CAD_DATA.tag);
             if (cadData != null)
             {
@@ -249,5 +249,5 @@
             if (containsCADIncidentEvent())
             {
-                output += XMLWriter.openTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
+                output += XMLBuilder.openTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
                 for (I_ScriptEvent ev : eventsCopy)
                 {
@@ -264,19 +264,19 @@
 
                 eventsCopy = eventsCopy2;
-                output += XMLWriter.closeTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
-            }
-
-            output += XMLWriter.closeTag(ELEMENT.CAD_DATA.tag);
+                output += XMLBuilder.closeTag(ELEMENT.CAD_INCIDENT_EVENT.tag);
+            }
+
+            output += XMLBuilder.closeTag(ELEMENT.CAD_DATA.tag);
         }
 
         if (cadData != null && 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);
+            output += XMLBuilder.openTag(ELEMENT.GENERAL_INFO.tag);
+
+            output += XMLBuilder.simpleTag(cadData.General_Title, ELEMENT.TITLE);
+
+            output += XMLBuilder.simpleTag(cadData.General_Text, ELEMENT.TEXT);
+
+            output += XMLBuilder.closeTag(ELEMENT.GENERAL_INFO.tag);
 
         }
@@ -290,5 +290,5 @@
             }
         }
-        output += XMLWriter.closeTag(ELEMENT.SCRIPT_EVENT.tag);
+        output += XMLBuilder.closeTag(ELEMENT.SCRIPT_EVENT.tag);
         return output;
     }