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

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/io

Files:

• CacheFiles.java (modified) (1 diff)
• NmeaReader.java (modified) (2 diffs)
• OsmApi.java (modified) (1 diff)
• OsmServerReader.java (modified) (1 diff)
• imagery/WMSGrabber.java (modified) (1 diff)
• remotecontrol/RequestProcessor.java (modified) (1 diff)

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

@@ -322 +322 @@
         try {
             MessageDigest md = MessageDigest.getInstance("MD5");
-            BigInteger number = new BigInteger(1, md.digest(ident.getBytes()));
+            BigInteger number = new BigInteger(1, md.digest(ident.getBytes(Utils.UTF_8)));
             return number.toString(16);
         } catch(Exception e) {

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

@@ -176 +176 @@
         BufferedReader rd = null;
         try {
-            rd = new BufferedReader(new InputStreamReader(source));
+            rd = new BufferedReader(new InputStreamReader(source, Utils.UTF_8));
 
             StringBuilder sb = new StringBuilder(1024);
@@ -243 +243 @@
             if(chkstrings.length > 1)
             {
-                byte[] chb = chkstrings[0].getBytes();
+                byte[] chb = chkstrings[0].getBytes(Utils.UTF_8);
                 int chk=0;
                 for (int i = 1; i < chb.length; i++) {

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

@@ -191 +191 @@
         @Override
         protected byte[] updateData() throws OsmTransferException {
-            return sendRequest("GET", "capabilities", null, monitor, false, fastFail).getBytes();
+            return sendRequest("GET", "capabilities", null, monitor, false, fastFail).getBytes(Utils.UTF_8);
         }
     }

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

@@ -174 +174 @@
                         InputStream i = fixEncoding(activeConnection.getErrorStream(), encoding);
                         if (i != null) {
-                            BufferedReader in = new BufferedReader(new InputStreamReader(i));
+                            BufferedReader in = new BufferedReader(new InputStreamReader(i, Utils.UTF_8));
                             String s;
                             while((s = in.readLine()) != null) {

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -190 +190 @@
         StringBuilder exception = new StringBuilder();
         InputStream in = conn.getInputStream();
-        BufferedReader br = new BufferedReader(new InputStreamReader(in));
+        BufferedReader br = new BufferedReader(new InputStreamReader(in, Utils.UTF_8));
         try {
             String line = null;

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -143 +143 @@
         try {
             OutputStream raw = new BufferedOutputStream(request.getOutputStream());
-            out = new OutputStreamWriter(raw);
+            out = new OutputStreamWriter(raw, Utils.UTF_8);
             BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "ASCII"));