Changeset 1525 in josm

Timestamp:

2009-04-09T01:17:09+02:00 (15 years ago)

Author:

framm

Message:

• fix charset on write/upload (always use utf-8 even if platform setting different). closes #2399, #2401.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveActionBase.java (modified) (1 diff)
• io/OsmApi.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -160 +160 @@
                     copy(file, tmpFile);
                 }
-                OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(file)), false, layer.data.version);
+                OsmWriter w = new OsmWriter(new PrintWriter(file, "UTF-8"), false, layer.data.version);
                 w.header();
                 w.writeDataSources(layer.data);

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -12 +12 @@
 import java.io.PrintWriter;
 import java.io.StringReader;
+import java.io.StringWriter;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
@@ -77 +78 @@
     private boolean initialized = false;
     
-    private ByteArrayOutputStream bao = new ByteArrayOutputStream();
-    private OsmWriter osmWriter = new OsmWriter(new PrintWriter(bao), true, null);
+    private StringWriter swriter = new StringWriter();
+    private OsmWriter osmWriter = new OsmWriter(new PrintWriter(swriter), true, null);
 
     /**
@@ -159 +160 @@
      */
     private String toXml(OsmPrimitive o, boolean addBody) {
-        bao.reset();
+        swriter.getBuffer().setLength(0);
         osmWriter.setWithBody(addBody);
         osmWriter.header();
@@ -165 +166 @@
         osmWriter.footer();
         osmWriter.out.flush();
-        return bao.toString();
+        return swriter.toString();
     }
     
@@ -365 +366 @@
                     activeConnection.setDoOutput(true);
                     OutputStream out = activeConnection.getOutputStream();
-                    BufferedWriter bwr = new BufferedWriter(new OutputStreamWriter(out));
+                    BufferedWriter bwr = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
                     bwr.write(requestBody);
                     bwr.flush();