Changeset 47 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/events

Timestamp:

08/08/2017 09:36:51 AM (9 years ago)

Author:

bmcguffin

Message:

Updated toXML behaviors for several classes to bring final adjustments in line with desired output.

Location:

trunk/src/scriptbuilder/structures/events

Files:

• CADEvent.java (modified) (2 diffs)
• ParamicsEvent.java (modified) (2 diffs)

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

@@ -6 +6 @@
 package scriptbuilder.structures.events;
 
+import java.util.StringTokenizer;
 import scriptbuilder.structures.ELEMENT;
 import scriptbuilder.structures.I_XML_Writable;
@@ -32 +33 @@
     public String toXML()
     {
-        String output = XMLWriter.simpleTag(detail, ELEMENT.DETAIL);
+        StringTokenizer tok = new StringTokenizer(detail, "\n");
+        String output = "";
+        while (tok.hasMoreTokens())
+        {
+            output += XMLWriter.simpleTag(tok.nextToken(), ELEMENT.DETAIL);
+        }
         return output;
     }

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

@@ -33 +33 @@
 
     public String locationID = "";
+
     @Override
     public String toXML()
@@ -40 +41 @@
         output += XMLWriter.simpleTag(status, ELEMENT.Status);
 
-        output += XMLWriter.simpleTag(type, ELEMENT.Incident_type);
+        if (!type.equals(""))
+        {
+            output += XMLWriter.simpleTag(type, ELEMENT.Incident_type);
+        }
 
         for (Integer lane : laneNums)
         {
-            output += XMLWriter.simpleTag(""+lane, ELEMENT.Lane_number);
+            output += XMLWriter.simpleTag("" + lane, ELEMENT.Lane_number);
         }
         output += XMLWriter.closeTag(ELEMENT.PARAMICS.tag);