Index: trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java	(revision 42)
+++ trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java	(revision 46)
@@ -10,4 +10,5 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
+import scriptbuilder.structures.XMLWriter;
 
 /**
@@ -62,12 +63,10 @@
     public String toXML()
     {
-        String output = openTag(ELEMENT.CMS_EVALUATION.tag + " cmsID=\"" + cmsID + "\" type=\"" + cmsType + "\"");
-        output += openTag(ELEMENT.LOCATION.tag);
-        output += location;
-        output += closeTag(ELEMENT.LOCATION.tag);
+        String output = XMLWriter.openTag(ELEMENT.CMS_EVALUATION.tag + " cmsID=\"" + cmsID + "\" type=\"" + cmsType + "\"");
+        output += XMLWriter.simpleTag(location, ELEMENT.LOCATION);
 
         if (message.size() > 0)
         {
-            output += openTag(ELEMENT.SAMPLE_MESSAGE.tag);
+            output += XMLWriter.openTag(ELEMENT.SAMPLE_MESSAGE.tag);
             for (String str : message)
             {
@@ -76,32 +75,12 @@
                     str = "";
                 }
-                output += openTag(ELEMENT.CMS_LINE.tag);
-                output += str;
-                output += closeTag(ELEMENT.CMS_LINE.tag);
+                output += XMLWriter.simpleTag(str, ELEMENT.CMS_LINE);
             }
-            output += closeTag(ELEMENT.SAMPLE_MESSAGE.tag);
+            output += XMLWriter.closeTag(ELEMENT.SAMPLE_MESSAGE.tag);
         }
 
-        output += closeTag(ELEMENT.CMS_EVALUATION.tag);
+        output += XMLWriter.closeTag(ELEMENT.CMS_EVALUATION.tag);
 
         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";
-    }
 }