Changeset 203 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/SimulationScript.java

Timestamp:

02/01/2020 04:18:21 PM (6 years ago)

Author:

jdalbey

Message:

XMLWriter.java name changed to XMLBuilder. Add pretty printing methods (ticket #237).

File:

• trunk/src/scriptbuilder/structures/SimulationScript.java (modified) (4 diffs)

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -18 +18 @@
 import java.nio.file.Paths;
 import java.util.TreeMap;
+import static scriptbuilder.structures.XMLBuilder.prettyPrintXML;
 
 /**
@@ -249 +250 @@
 
             BufferedWriter bw = new BufferedWriter(new FileWriter(f));
-            bw.write(this.toXML());
+            // convert to XML and remove newlines
+            String xmlOut = (this.toXML()).replace("\n",""); 
+            // pretty print and save to file
+            bw.write(prettyPrintXML(xmlOut));
             bw.flush();
             bw.close();
-
         }
         catch (Exception ex)
@@ -358 +361 @@
         ArrayList<TimeSlice> slices = arrangeAllSlices();
         String output = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
-        output += XMLWriter.externalDTD();
-        output += XMLWriter.openTag(ELEMENT.TMC_SCRIPT.tag + " title=\"" + this.title + "\"");
+        output += XMLBuilder.externalDTD();
+        output += XMLBuilder.openTag(ELEMENT.TMC_SCRIPT.tag + " title=\"" + this.title + "\"");
 
         if (units.size() > 0)
         {
-            output += XMLWriter.openTag(ELEMENT.SCRIPT_DATA.tag);
+            output += XMLBuilder.openTag(ELEMENT.SCRIPT_DATA.tag);
             for (Unit unit : units)
             {
                 output += unit.toXML();
             }
-            output += XMLWriter.closeTag(ELEMENT.SCRIPT_DATA.tag);
+            output += XMLBuilder.closeTag(ELEMENT.SCRIPT_DATA.tag);
         }
         for (TimeSlice slice : slices)
@@ -374 +377 @@
             output += slice.toXML();
         }
-        output += XMLWriter.closeTag(ELEMENT.TMC_SCRIPT.tag);
+        output += XMLBuilder.closeTag(ELEMENT.TMC_SCRIPT.tag);
         return output;
     }