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

Timestamp:

2013-12-28T00:30:15+01:00 (11 years ago)

Author:

simon04

Message:

Refactoring: introduce Utils.UTF_8 charset to avoid handling of UnsupportedEncodingException

According to the Javadoc of Charset, every implementation of the Java
platform is required to support UTF-8.

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• CustomConfigurator.java (modified) (1 diff)
• Preferences.java (modified) (2 diffs)
• validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• validation/tests/OpeningHourTest.java (modified) (2 diffs)
• validation/tests/TagChecker.java (modified) (2 diffs)
• validation/tests/UnconnectedWays.java (modified) (1 diff)

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

@@ -232 +232 @@
         try {
             String toXML = Main.pref.toXML(true);
-            InputStream is = new ByteArrayInputStream(toXML.getBytes("UTF-8"));
+            InputStream is = new ByteArrayInputStream(toXML.getBytes(Utils.UTF_8));
             DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
             builderFactory.setValidating(false);

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

@@ -596 +596 @@
 
         final PrintWriter out = new PrintWriter(new OutputStreamWriter(
-                new FileOutputStream(prefFile + "_tmp"), "utf-8"), false);
+                new FileOutputStream(prefFile + "_tmp"), Utils.UTF_8), false);
         out.print(toXML(false));
         Utils.close(out);
@@ -621 +621 @@
         if (!Main.applet) {
             File pref = getPreferenceFile();
-            BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), "utf-8"));
+            BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), Utils.UTF_8));
             try {
                 validateXML(in);
                 Utils.close(in);
-                in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), "utf-8"));
+                in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), Utils.UTF_8));
                 fromXML(in);
             } finally {

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -6 +6 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -368 +367 @@
      * @param internalConfigFile the filename in data/validator
      * @throws ParseException if the config file does not match MapCSS syntax
-     * @throws UnsupportedEncodingException if UTF-8 charset is not supported on the platform
      */
-    private void addMapCSS(String internalConfigFile) throws ParseException, UnsupportedEncodingException {
-        addMapCSS(new InputStreamReader(getClass().getResourceAsStream("/data/validator/" + internalConfigFile + ".mapcss"), "UTF-8"));
+    private void addMapCSS(String internalConfigFile) throws ParseException {
+        addMapCSS(new InputStreamReader(getClass().getResourceAsStream("/data/validator/" + internalConfigFile + ".mapcss"), Utils.UTF_8));
     }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -53 +54 @@
         super.initialize();
         if (ENGINE != null) {
-            ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/validator/opening_hours.js"), "UTF-8"));
+            ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/validator/opening_hours.js"), Utils.UTF_8));
             // fake country/state to not get errors on holidays
             ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -14 +14 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -211 +210 @@
             try {
                 MirroredInputStream s = new MirroredInputStream(source);
-                InputStreamReader r;
-                try {
-                    r = new InputStreamReader(s, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
-                    r = new InputStreamReader(s);
-                }
-                reader = new BufferedReader(r);
+                reader = new BufferedReader(new InputStreamReader(s, Utils.UTF_8));
 
                 String okValue = null;

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -128 +128 @@
                     }
                     if (en.hasTag("highway", "turning_circle", "bus_stop")
+                            || en.hasTag("amenity", "parking_entrance")
                             || en.hasTag("railway", "buffer_stop")
                             || OsmUtils.isTrue(en.get("noexit"))
+                            || en.hasKey("entrance")
                             || en.hasKey("barrier")) {
                         continue;