eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-15 11:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

modify XML.toString() to use indent(-1) instead of indent(2)

Browse Source
This commit is contained in:
Ben Fry
2013-06-03 14:59:48 -04:00
parent 7c89eb0a9f
commit b635f8a2cf
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/processing/data/XML.java
View File

@@ -242,6 +242,8 @@ public class XML implements Serializable {
}
// Sends this object and its kids to a Writer with an indent of 2 spaces,
// including the declaration at the top so that the output will be valid XML.
public boolean write(PrintWriter output) {
output.print(format(2));
output.flush();
@@ -1010,10 +1012,10 @@ public class XML implements Serializable {
// Might just be whitespace, which won't be valid XML for parsing below.
// https://github.com/processing/processing/issues/1796
// Since indent is not -1, that means they want valid XML,
// so we'll give them the single line plus the decl.
// so we'll give them the single line plus the decl... Lame? sure.
if (singleLine.trim().length() == 0) {
// You want whitespace? I've got your whitespace right here.
return singleLine;
return decl + sep + singleLine;
}
// Since the indent is not -1, bring back the XML declaration
@@ -1025,8 +1027,9 @@ public class XML implements Serializable {
Source source = new StreamSource(new StringReader(singleLine));
transformer.transform(source, xmlOutput);
String outgoing = stringWriter.toString();
// Add the XML declaration to the top if it's not there already
if (!outgoing.startsWith(decl)) {
// Add the XML declaration to the top if it's not there already
return decl + sep + outgoing;
} else {
return outgoing;