Index: trunk/src/scriptbuilder/structures/CadData.java
===================================================================
--- trunk/src/scriptbuilder/structures/CadData.java	(revision 43)
+++ trunk/src/scriptbuilder/structures/CadData.java	(revision 46)
@@ -65,120 +65,86 @@
         if (!Master_Inc_Num.equals(""))
         {
-            output += openTag(ELEMENT.MASTER_INC_NUM.tag);
-            output += Master_Inc_Num;
-            output += closeTag(ELEMENT.MASTER_INC_NUM.tag);
+            output += XMLWriter.simpleTag(Master_Inc_Num, ELEMENT.MASTER_INC_NUM);
         }
 
         if (!P.equals(""))
         {
-            output += openTag(ELEMENT.P.tag);
-            output += P;
-            output += closeTag(ELEMENT.P.tag);
+            output += XMLWriter.simpleTag(P, ELEMENT.P);
         }
 
         if (hasAdditionalInfo())
         {
-            output += openTag(ELEMENT.ADDITIONAL_INFO.tag);
-            output += openTag(ELEMENT.TYPE_CODE.tag);
-            output += Info_Type_Code;
-            output += closeTag(ELEMENT.TYPE_CODE.tag);
-            output += openTag(ELEMENT.TYPE.tag);
-            output += Info_Type;
-            output += closeTag(ELEMENT.TYPE.tag);
-            output += closeTag(ELEMENT.ADDITIONAL_INFO.tag);
+            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);
         }
 
         if (hasLocation())
         {
-            output += openTag(ELEMENT.LOCATION.tag);
+            output += XMLWriter.openTag(ELEMENT.LOCATION.tag);
             if (!Location_Beat.equals(""))
             {
-                output += openTag(ELEMENT.BEAT.tag);
-                output += Location_Beat;
-                output += closeTag(ELEMENT.BEAT.tag);
+                output += XMLWriter.simpleTag(Location_Beat, ELEMENT.BEAT);
             }
 
             if (!Location_Address.equals(""))
             {
-                output += openTag(ELEMENT.ADDRESS.tag);
-                output += Location_Address;
-                output += closeTag(ELEMENT.ADDRESS.tag);
+                output += XMLWriter.simpleTag(Location_Address, ELEMENT.ADDRESS);
             }
 
             if (!Location_Loc.equals(""))
             {
-                output += openTag(ELEMENT.LOC.tag);
-                output += Location_Loc;
-                output += closeTag(ELEMENT.LOC.tag);
+                output += XMLWriter.simpleTag(Location_Loc, ELEMENT.LOC);
             }
 
             if (!Location_City.equals(""))
             {
-                output += openTag(ELEMENT.CITY.tag);
-                output += Location_City;
-                output += closeTag(ELEMENT.CITY.tag);
+                output += XMLWriter.simpleTag(Location_City, ELEMENT.CITY);
             }
 
             if (!Location_Area.equals(""))
             {
-                output += openTag(ELEMENT.AREA.tag);
-                output += Location_Area;
-                output += closeTag(ELEMENT.AREA.tag);
+                output += XMLWriter.simpleTag(Location_Area, ELEMENT.AREA);
             }
 
             if (!Location_Fire.equals(""))
             {
-                output += openTag(ELEMENT.FIRE.tag);
-                output += Location_Fire;
-                output += closeTag(ELEMENT.FIRE.tag);
+                output += XMLWriter.simpleTag(Location_Fire, ELEMENT.FIRE);
             }
 
             if (!Location_Law.equals(""))
             {
-                output += openTag(ELEMENT.LAW.tag);
-                output += Location_Law;
-                output += closeTag(ELEMENT.LAW.tag);
+                output += XMLWriter.simpleTag(Location_Law, ELEMENT.LAW);
             }
 
             if (!Location_Ems.equals(""))
             {
-                output += openTag(ELEMENT.EMS.tag);
-                output += Location_Ems;
-                output += closeTag(ELEMENT.EMS.tag);
+                output += XMLWriter.simpleTag(Location_Ems, ELEMENT.EMS);
             }
 
-            output += closeTag(ELEMENT.LOCATION.tag);
+            output += XMLWriter.closeTag(ELEMENT.LOCATION.tag);
         }
 
         if (!Agy.equals(""))
         {
-            output += openTag(ELEMENT.GENERAL.tag);
-            output += openTag(ELEMENT.AGY.tag);
-            output += Agy;
-            output += closeTag(ELEMENT.AGY.tag);
-            output += closeTag(ELEMENT.GENERAL.tag);
+            output += XMLWriter.openTag(ELEMENT.GENERAL.tag);
+            output += XMLWriter.simpleTag(Agy, ELEMENT.AGY);
+            output += XMLWriter.closeTag(ELEMENT.GENERAL.tag);
         }
 
         if (hasHeaderInfo())
         {
-            output += openTag(ELEMENT.HEADER_INFO.tag);
+            output += XMLWriter.openTag(ELEMENT.HEADER_INFO.tag);
 
-            output += openTag(ELEMENT.Type.tag);
-            output += Header_Type;
-            output += closeTag(ELEMENT.Type.tag);
+            output += XMLWriter.simpleTag(Header_Type, ELEMENT.Type);
 
-            output += openTag(ELEMENT.Beat.tag);
-            output += Header_Beat;
-            output += closeTag(ELEMENT.Beat.tag);
+            output += XMLWriter.simpleTag(Header_Beat, ELEMENT.Beat);
+            
+            output += XMLWriter.simpleTag(Header_TruncLoc, ELEMENT.TruncLoc);
+            
+            output += XMLWriter.simpleTag(Header_FullLoc, ELEMENT.FullLoc);
 
-            output += openTag(ELEMENT.TruncLoc.tag);
-            output += Header_TruncLoc;
-            output += closeTag(ELEMENT.TruncLoc.tag);
-
-            output += openTag(ELEMENT.FullLoc.tag);
-            output += Header_FullLoc;
-            output += closeTag(ELEMENT.FullLoc.tag);
-
-            output += closeTag(ELEMENT.HEADER_INFO.tag);
+            output += XMLWriter.closeTag(ELEMENT.HEADER_INFO.tag);
         }
 
@@ -192,22 +158,4 @@
 
         return output;
-    }
-
-    @Override
-    public String openTag(String s)
-    {
-        return "<" + s + ">";
-    }
-
-    @Override
-    public String closeTag(String s)
-    {
-        return "</" + s + ">\n";
-    }
-
-    @Override
-    public String emptyTag(String s)
-    {
-        return "<" + s + "/>\n";
     }