[tiled] r735 - trunk/src/tiled/io/xml

[tiled-svn at biggeruniverse.com]

Author: aturk
Date: 2008-04-01 15:48:16 -0600 (Tue, 01 Apr 2008)
New Revision: 735

Modified:
   trunk/src/tiled/io/xml/XMLMapTransformer.java
   trunk/src/tiled/io/xml/XMLWriter.java
Log:
Quick fix to parse Unicode in TMX files correctly. Also sets encoding of saved TMX files to UTF-8. (Thanks to seeseekey on TMW forums for pointing this out)

Modified: trunk/src/tiled/io/xml/XMLMapTransformer.java
===================================================================
--- trunk/src/tiled/io/xml/XMLMapTransformer.java	2008-03-30 21:15:57 UTC (rev 734)
+++ trunk/src/tiled/io/xml/XMLMapTransformer.java	2008-04-01 21:48:16 UTC (rev 735)
@@ -30,6 +30,7 @@
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import tiled.core.*;
 import tiled.io.ImageHelper;
@@ -719,7 +720,10 @@
             factory.setIgnoringElementContentWhitespace(true);
             factory.setExpandEntityReferences(false);
             DocumentBuilder builder = factory.newDocumentBuilder();
-            doc = builder.parse(in, xmlPath);
+            InputSource insrc = new InputSource(in);
+            insrc.setSystemId(xmlPath);
+            insrc.setEncoding("UTF8");
+            doc = builder.parse(insrc);
         } catch (SAXException e) {
             e.printStackTrace();
             throw new Exception("Error while parsing map file: " +

Modified: trunk/src/tiled/io/xml/XMLWriter.java
===================================================================
--- trunk/src/tiled/io/xml/XMLWriter.java	2008-03-30 21:15:57 UTC (rev 734)
+++ trunk/src/tiled/io/xml/XMLWriter.java	2008-04-01 21:48:16 UTC (rev 735)
@@ -56,7 +56,7 @@
     }
 
     public void startDocument(String version) throws IOException {
-        w.write("<?xml version=\"" + version + "\"?>" + newLine);
+        w.write("<?xml version=\"" + version + "\" encoding=\"UTF-8\"?>" + newLine);
         bDocumentOpen = true;
     }