Changeset 206 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder

Timestamp:

02/03/2020 04:01:55 PM (6 years ago)

Author:

jdalbey

Message:

Modify prettyprint code to prepend xml header lines AFTER the pretty printing to fix #239. Removes incident_script.dtd from trunk as it isn't needed for xml save anymore.

Location:

trunk/src/scriptbuilder

Files:

• gui/application.properties (modified) (1 diff)
• structures/SimulationScript.java (modified) (1 diff)
• structures/XMLBuilder.java (modified) (2 diffs)

trunk/src/scriptbuilder/gui/application.properties

@@ -1 @@
-#Wed, 29 Jan 2020 05:08:10 -0800
+#Mon, 03 Feb 2020 16:55:57 -0800
 
-Application.revision=198
+Application.revision=205
 
-Application.buildnumber=54
+Application.buildnumber=55
 
 Incidents.directory=Incidents

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -353 +353 @@
             
         }
-        
-        
-    }
+    }
+
     @Override
     public String toXML()
     {
         ArrayList<TimeSlice> slices = arrangeAllSlices();
-        String output = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
-        output += XMLBuilder.externalDTD();
+        String output = "";
         output += XMLBuilder.openTag(ELEMENT.TMC_SCRIPT.tag + " title=\"" + this.title + "\"");
 

trunk/src/scriptbuilder/structures/XMLBuilder.java

@@ -84 +84 @@
 
     /**
-     * Generates the link to external DTD for XML script files.
-     *
-     * @return
+     * @return the xml string with the link to external DTD for XML script files.
      */
     public static String externalDTD()
     {
-        String output = "";
-        output += "<!DOCTYPE TMC_SCRIPT SYSTEM \"incident_script.dtd\">\n";
-        return output;
+        return "<!DOCTYPE TMC_SCRIPT SYSTEM \"incident_script.dtd\">\n";
     }
-    
+    /**
+     * @return The xml string that starts the document.
+     */
+    public static String xmlHeader()
+    {
+        return "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
+    }
     /**
      * Prettyprint an XML string.
@@ -111 +113 @@
             e.printStackTrace();
         }
+        // Prepend the header and externalDTD lines.  (This must be done after
+        // prettyprinting, which tries to read the externalDTD if the link is present.)
+        // Fixes #239.
+        formattedXML = xmlHeader() + externalDTD() + formattedXML;
         return formattedXML;
     }