Index: trunk/src/scriptbuilder/structures/CadData.java
===================================================================
--- trunk/src/scriptbuilder/structures/CadData.java	(revision 145)
+++ trunk/src/scriptbuilder/structures/CadData.java	(revision 203)
@@ -82,71 +82,71 @@
         if (!Master_Inc_Num.equals(""))
         {
-            output += XMLWriter.simpleTag(Master_Inc_Num, ELEMENT.MASTER_INC_NUM);
+            output += XMLBuilder.simpleTag(Master_Inc_Num, ELEMENT.MASTER_INC_NUM);
         }
 
         if (!P.equals(""))
         {
-            output += XMLWriter.simpleTag(P, ELEMENT.P);
+            output += XMLBuilder.simpleTag(P, ELEMENT.P);
         }
 
         if (hasAdditionalInfo())
         {
-            output += XMLWriter.openTag(ELEMENT.ADDITIONAL_INFO.tag);
-            output += XMLWriter.simpleTag(Info_Type_Code, ELEMENT.TYPE_CODE);
-            output += XMLWriter.simpleTag(Info_Type, ELEMENT.TYPE);
-            output += XMLWriter.closeTag(ELEMENT.ADDITIONAL_INFO.tag);
+            output += XMLBuilder.openTag(ELEMENT.ADDITIONAL_INFO.tag);
+            output += XMLBuilder.simpleTag(Info_Type_Code, ELEMENT.TYPE_CODE);
+            output += XMLBuilder.simpleTag(Info_Type, ELEMENT.TYPE);
+            output += XMLBuilder.closeTag(ELEMENT.ADDITIONAL_INFO.tag);
         }
 
         if (hasLocation())
         {
-            output += XMLWriter.openTag(ELEMENT.LOCATION.tag);
+            output += XMLBuilder.openTag(ELEMENT.LOCATION.tag);
             if (!Location_Beat.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_Beat, ELEMENT.BEAT);
+                output += XMLBuilder.simpleTag(Location_Beat, ELEMENT.BEAT);
             }
 
             if (!Location_Address.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_Address, ELEMENT.ADDRESS);
+                output += XMLBuilder.simpleTag(Location_Address, ELEMENT.ADDRESS);
             }
 
             if (!Location_Loc.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_Loc, ELEMENT.LOC);
+                output += XMLBuilder.simpleTag(Location_Loc, ELEMENT.LOC);
             }
 
             if (!Location_City.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_City, ELEMENT.CITY);
+                output += XMLBuilder.simpleTag(Location_City, ELEMENT.CITY);
             }
 
             if (!Location_Area.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_Area, ELEMENT.AREA);
+                output += XMLBuilder.simpleTag(Location_Area, ELEMENT.AREA);
             }
 
             if (!Location_Fire.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_Fire, ELEMENT.FIRE);
+                output += XMLBuilder.simpleTag(Location_Fire, ELEMENT.FIRE);
             }
 
             if (!Location_Law.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_Law, ELEMENT.LAW);
+                output += XMLBuilder.simpleTag(Location_Law, ELEMENT.LAW);
             }
 
             if (!Location_Ems.equals(""))
             {
-                output += XMLWriter.simpleTag(Location_Ems, ELEMENT.EMS);
-            }
-
-            output += XMLWriter.closeTag(ELEMENT.LOCATION.tag);
+                output += XMLBuilder.simpleTag(Location_Ems, ELEMENT.EMS);
+            }
+
+            output += XMLBuilder.closeTag(ELEMENT.LOCATION.tag);
         }
 
         if (!Agy.equals(""))
         {
-            output += XMLWriter.openTag(ELEMENT.GENERAL.tag);
-            output += XMLWriter.simpleTag(Agy, ELEMENT.AGY);
-            output += XMLWriter.closeTag(ELEMENT.GENERAL.tag);
+            output += XMLBuilder.openTag(ELEMENT.GENERAL.tag);
+            output += XMLBuilder.simpleTag(Agy, ELEMENT.AGY);
+            output += XMLBuilder.closeTag(ELEMENT.GENERAL.tag);
         }
 
@@ -154,15 +154,15 @@
         {
             //todo: make this logic trigger only once per incident
-            output += XMLWriter.openTag(ELEMENT.HEADER_INFO.tag);
-
-            output += XMLWriter.simpleTag(Header_Type, ELEMENT.Type);
-
-            output += XMLWriter.simpleTag(Header_Beat, ELEMENT.Beat);
-
-            output += XMLWriter.simpleTag(Header_TruncLoc, ELEMENT.TruncLoc);
-
-            output += XMLWriter.simpleTag(Header_FullLoc, ELEMENT.FullLoc);
-
-            output += XMLWriter.closeTag(ELEMENT.HEADER_INFO.tag);
+            output += XMLBuilder.openTag(ELEMENT.HEADER_INFO.tag);
+
+            output += XMLBuilder.simpleTag(Header_Type, ELEMENT.Type);
+
+            output += XMLBuilder.simpleTag(Header_Beat, ELEMENT.Beat);
+
+            output += XMLBuilder.simpleTag(Header_TruncLoc, ELEMENT.TruncLoc);
+
+            output += XMLBuilder.simpleTag(Header_FullLoc, ELEMENT.FullLoc);
+
+            output += XMLBuilder.closeTag(ELEMENT.HEADER_INFO.tag);
         }