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

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

Files:

• AutosaveTask.java (modified) (3 diffs)
• ServerSidePreferences.java (modified) (4 diffs)
• projection/Projections.java (modified) (1 diff)
• projection/datum/NTV2GridShiftFile.java (modified) (1 diff)
• projection/datum/NTV2SubGrid.java (modified) (1 diff)
• validation/OsmValidator.java (modified) (3 diffs)

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