Changeset 6995 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-04-23T02:30:39+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9906 - fix reliance on default encoding

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (2 diffs)
• PlatformHookUnixoid.java (modified) (3 diffs)
• Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -543 +543 @@
                 } else {
                     try {
-                        bytes = URLDecoder.decode(data, "utf-8").getBytes();
+                        bytes = URLDecoder.decode(data, "UTF-8").getBytes(Utils.UTF_8);
                     } catch (IllegalArgumentException ex) {
                         Main.warn("Unable to decode URL data part: "+ex.getMessage() + " (" + data + ")");
@@ -550 +550 @@
                 }
                 if (mediatype != null && mediatype.contains("image/svg+xml")) {
-                    String s = new String(bytes);
+                    String s = new String(bytes, Utils.UTF_8);
                     URI uri = getSvgUniverse().loadSVG(new StringReader(s), URLEncoder.encode(s, "UTF-8"));
                     SVGDiagram svg = getSvgUniverse().getDiagram(uri);

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -10 +10 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -227 +227 @@
                 // Try lsb_release (only available on LSB-compliant Linux systems, see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
                 Process p = Runtime.getRuntime().exec("lsb_release -ds");
-                BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+                BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), Utils.UTF_8));
                 String line = Utils.strip(input.readLine());
                 Utils.close(input);
@@ -312 +312 @@
                     BufferedReader reader = null;
                     try {
-                        reader = new BufferedReader(new FileReader(file));
+                        reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), Utils.UTF_8));
                         String id = null;
                         String release = null;

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -812 +812 @@
         }
         Process p = new ProcessBuilder(command).start();
-        BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), UTF_8));
         StringBuilder all = null;
         String line;