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

fix XML indentation and Android issues (issue #1512)

Browse Source
This commit is contained in:
benfry
2012-12-22 16:35:51 +00:00
parent cf05993ab4
commit 91972d0e9d
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -829,25 +829,23 @@ public class XML implements Serializable {
// least the Giants are getting blown out by the Falcons.
final String decl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
// needed for splitting or when adding decl below?
//System.getProperty("line.separator")
final String sep = System.getProperty("line.separator");
StringWriter tempWriter = new StringWriter();
StreamResult tempResult = new StreamResult(tempWriter);
transformer.transform(new DOMSource(node), tempResult);
String[] tempLines = PApplet.split(tempWriter.toString(), '\n');
PApplet.println(tempLines);
if (tempLines[0].startsWith(decl)) {
String[] tempLines = PApplet.split(tempWriter.toString(), sep);
// PApplet.println(tempLines);
if (tempLines[0].startsWith("<?xml")) {
// Remove XML declaration from the top before slamming into one line
int declEnd = tempLines[0].indexOf("?>") + 2;
//if (tempLines[0].length() == decl.length()) {
if (tempLines[0].length() == declEnd) {
// If it's all the XML declaration, remove it
PApplet.println("removing first line");
// PApplet.println("removing first line");
tempLines = PApplet.subset(tempLines, 1);
} else {
PApplet.println("removing part of first line");
// PApplet.println("removing part of first line");
// If the first node has been moved to this line, be more careful
//tempLines[0] = tempLines[0].substring(decl.length());
tempLines[0] = tempLines[0].substring(declEnd);
@@ -866,7 +864,7 @@ public class XML implements Serializable {
// DOMSource source = new DOMSource(node);
Source source = new StreamSource(new StringReader(singleLine));
transformer.transform(source, xmlOutput);
return decl + "\n" + stringWriter.toString();
return decl + sep + stringWriter.toString();
// return xmlOutput.getWriter().toString();
} catch (Exception e) {