Changeset 46 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/events/ParamicsEvent.java

Timestamp:

08/07/2017 04:20:08 PM (9 years ago)

Author:

bmcguffin

Message:

Added file: XMLWriter, in package Scriptbuilder.structures. It holds static methods which ither classes that implement I_XML_Writable may find useful. Also restructured the toXML method of many classes to utilize this new class.

File:

• trunk/src/scriptbuilder/structures/events/ParamicsEvent.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/events/ParamicsEvent.java

@@ -10 +10 @@
 import scriptbuilder.structures.I_XML_Writable;
 import scriptbuilder.structures.ScriptEvent;
+import scriptbuilder.structures.XMLWriter;
 
 /**
@@ -32 +33 @@
 
     public String locationID = "";
-
-    @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";
-    }
-
     @Override
     public String toXML()
     {
-        String output = openTag(ELEMENT.PARAMICS.tag + " LocationID=\"" + locationID + "\"");
+        String output = XMLWriter.openTag(ELEMENT.PARAMICS.tag + " LocationID=\"" + locationID + "\"");
 
-        output += openTag(ELEMENT.Status.tag);
-        output += status;
-        output += closeTag(ELEMENT.Status.tag);
+        output += XMLWriter.simpleTag(status, ELEMENT.Status);
 
-        output += openTag(ELEMENT.Incident_type.tag);
-        output += type;
-        output += closeTag(ELEMENT.Incident_type.tag);
+        output += XMLWriter.simpleTag(type, ELEMENT.Incident_type);
 
         for (Integer lane : laneNums)
         {
-            output += openTag(ELEMENT.Lane_number.tag);
-            output += lane;
-            output += closeTag(ELEMENT.Lane_number.tag);
+            output += XMLWriter.simpleTag(""+lane, ELEMENT.Lane_number);
         }
-        output += closeTag(ELEMENT.PARAMICS.tag);
+        output += XMLWriter.closeTag(ELEMENT.PARAMICS.tag);
 
         return output;