Changeset 6995 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

fix #9906 - fix reliance on default encoding

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenFileAction.java (modified) (2 diffs)
• data/AutosaveTask.java (modified) (3 diffs)
• data/ServerSidePreferences.java (modified) (4 diffs)
• data/projection/Projections.java (modified) (1 diff)
• data/projection/datum/NTV2GridShiftFile.java (modified) (1 diff)
• data/projection/datum/NTV2SubGrid.java (modified) (1 diff)
• data/validation/OsmValidator.java (modified) (3 diffs)
• gui/MainApplication.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (2 diffs)
• gui/dialogs/MapPaintDialog.java (modified) (1 diff)
• gui/help/HelpBrowser.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (1 diff)
• gui/mappaint/xml/XmlStyleSource.java (modified) (1 diff)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (1 diff)
• gui/preferences/server/ApiUrlTestTask.java (modified) (1 diff)
• io/CacheFiles.java (modified) (1 diff)
• io/NmeaReader.java (modified) (2 diffs)
• io/OsmApi.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)
• io/imagery/WMSGrabber.java (modified) (1 diff)
• io/remotecontrol/RequestProcessor.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (2 diffs)
• tools/PlatformHookUnixoid.java (modified) (3 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.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;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -292 +293 @@
                 for (File urlFile: urlFiles) {
                     try {
-                        BufferedReader reader = new BufferedReader(new FileReader(urlFile));
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(urlFile), Utils.UTF_8));
                         String line;
                         while ((line = reader.readLine()) != null) {

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -159 +159 @@
                     try {
                         File pidFile = new File(autosaveDir, filename+".pid");
-                        PrintStream ps = new PrintStream(pidFile);
+                        PrintStream ps = new PrintStream(pidFile, "UTF-8");
                         ps.println(ManagementFactory.getRuntimeMXBean().getName());
                         Utils.close(ps);
@@ -310 +310 @@
                 if (pidFile.exists()) {
                     try {
-                        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(pidFile)));
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(pidFile), Utils.UTF_8));
                         try {
                             String jvmId = reader.readLine();
@@ -403 +403 @@
     }
 
-    public void dicardUnsavedLayers() {
+    public void discardUnsavedLayers() {
         for (File f: getUnsavedLayersFiles()) {
             moveToDeletedLayersFolder(f);

trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

@@ -32 +32 @@
 public class ServerSidePreferences extends Preferences {
     public static class MissingPassword extends Exception{
-        public String realm;
+        public final String realm;
         public MissingPassword(String r) {
             realm = r;
@@ -62 +62 @@
                     throw new MissingPassword(t);
                 }
-                BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
+                BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream(), Utils.UTF_8));
                 StringBuilder b = new StringBuilder();
                 try {
@@ -94 +94 @@
                 con.setDoOutput(true);
                 con.connect();
-                PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutputStream()));
+                PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutputStream(), Utils.UTF_8));
                 out.println(s);
                 Utils.close(out);
@@ -117 +117 @@
     }
 
+    /**
+     * Constructs a new {@code ServerSidePreferences}.
+     * @param serverUrl The server URL hosting the user preferences.
+     */
     public ServerSidePreferences(URL serverUrl) {
         Connection connection = null;

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -135 +135 @@
         try {
             InputStream in = new MirroredInputStream("resource://data/projection/epsg");
-            r = new BufferedReader(new InputStreamReader(in));
+            r = new BufferedReader(new InputStreamReader(in, Utils.UTF_8));
             String line, lastline = "";
             while ((line = r.readLine()) != null) {

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -104 +104 @@
         topLevelSubGrid = null;
         in.read(b8);
-        String overviewHeaderCountId = new String(b8);
+        String overviewHeaderCountId = new String(b8, Utils.UTF_8);
         if (!"NUM_OREC".equals(overviewHeaderCountId))
             throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

@@ -75 +75 @@
         in.read(b8);
         in.read(b8);
-        subGridName = new String(b8).trim();
-        in.read(b8);
-        in.read(b8);
-        parentSubGridName = new String(b8).trim();
-        in.read(b8);
-        in.read(b8);
-        created = new String(b8);
-        in.read(b8);
-        in.read(b8);
-        updated = new String(b8);
+        subGridName = new String(b8, Utils.UTF_8).trim();
+        in.read(b8);
+        in.read(b8);
+        parentSubGridName = new String(b8, Utils.UTF_8).trim();
+        in.read(b8);
+        in.read(b8);
+        created = new String(b8, Utils.UTF_8);
+        in.read(b8);
+        in.read(b8);
+        updated = new String(b8, Utils.UTF_8);
         in.read(b8);
         in.read(b8);

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -6 +6 @@
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -171 +173 @@
                 BufferedReader in = null;
                 try {
-                    in = new BufferedReader(new FileReader(file));
+                    in = new BufferedReader(new InputStreamReader(new FileInputStream(file), Utils.UTF_8));
                     for (String line = in.readLine(); line != null; line = in.readLine()) {
                         ignoredErrors.add(line);
@@ -197 +199 @@
         PrintWriter out = null;
         try {
-            out = new PrintWriter(new FileWriter(getValidatorDir() + "ignorederrors"), false);
+            out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(getValidatorDir() + "ignorederrors"), Utils.UTF_8), false);
             for (String e : ignoredErrors) {
                 out.println(e);

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -492 +492 @@
                         autosaveTask.recoverUnsavedLayers();
                     } else if (selection == 3) {
-                        autosaveTask.dicardUnsavedLayers();
+                        autosaveTask.discardUnsavedLayers();
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -22 +22 @@
 import java.util.TreeMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.zip.CRC32;
 
 import javax.swing.JComponent;
@@ -1326 +1327 @@
         String x = center.east() + "_" + center.north() + "_" + scale + "_" +
                 getWidth() + "_" + getHeight() + "_" + getProjection().toString();
-        java.util.zip.CRC32 id = new java.util.zip.CRC32();
-        id.update(x.getBytes());
+        CRC32 id = new CRC32();
+        id.update(x.getBytes(Utils.UTF_8));
         return (int)id.getValue();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -659 +659 @@
                 InputStream is = s.getSourceInputStream();
                 try {
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(is, Utils.UTF_8));
                     try {
                         String line;

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -137 +137 @@
         BufferedReader reader = new BufferedReader(
                 new InputStreamReader(
-                        getClass().getResourceAsStream("/data/help-browser.css")
+                        getClass().getResourceAsStream("/data/help-browser.css"),
+                        Utils.UTF_8
                 )
         );

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -235 +235 @@
                 return new XmlStyleSource(entry);
             else {
-                InputStreamReader reader = new InputStreamReader(in);
+                InputStreamReader reader = new InputStreamReader(in, Utils.UTF_8);
                 try {
                     WHILE: while (true) {

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -77 +77 @@
             InputStream in = getSourceInputStream();
             try {
-                InputStreamReader reader = new InputStreamReader(in);
+                InputStreamReader reader = new InputStreamReader(in, Utils.UTF_8);
                 XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this));
                 parser.startWithValidation(reader,

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -214 +214 @@
         BufferedReader r = null;
         try {
-            r = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            r = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
             String c;
             Pattern p = Pattern.compile(".*authenticity_token.*value=\"([^\"]+)\".*");

trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

@@ -195 +195 @@
             }
             StringBuilder changesets = new StringBuilder();
-            bin = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            bin = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
             String line;
             while ((line = bin.readLine()) != null) {

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"));
 

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;