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

Timestamp:

2013-12-28T00:30:15+01:00 (12 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/tools

Files:

• BugReportExceptionHandler.java (modified) (1 diff)
• I18n.java (modified) (4 diffs)
• Utils.java (modified) (4 diffs)

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

@@ -194 +194 @@
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             GZIPOutputStream gzip = new GZIPOutputStream(out);
-            gzip.write(debugText.getBytes("UTF-8"));
+            gzip.write(debugText.getBytes(Utils.UTF_8));
             Utils.close(gzip);
 

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

@@ -548 +548 @@
                         if(rval != val) /* file corrupt */
                             return false;
-                        enstrings[i] = new String(str, 0, val, "utf-8");
+                        enstrings[i] = new String(str, 0, val, Utils.UTF_8);
                     }
                     for(int i = 0; i < trnum; ++i)
@@ -562 +562 @@
                         if(rval != val) /* file corrupt */
                             return false;
-                        trstrings[i] = new String(str, 0, val, "utf-8");
+                        trstrings[i] = new String(str, 0, val, Utils.UTF_8);
                     }
                     if(trnum > 0 && !p.containsKey(enstrings[0])) {
@@ -600 +600 @@
                         if(val != enval) /* file corrupt */
                             return false;
-                        String enstr = new String(str, 0, enval, "utf-8");
+                        String enstr = new String(str, 0, enval, Utils.UTF_8);
                         if(trval != 0)
                         {
@@ -606 +606 @@
                             if(val != trval) /* file corrupt */
                                 return false;
-                            String trstr = new String(str, 0, trval, "utf-8");
+                            String trstr = new String(str, 0, trval, Utils.UTF_8);
                             if(!s.containsKey(enstr))
                                 s.put(enstr, trstr);

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

@@ -23 +23 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -56 +56 @@
     }
 
+    /**
+     * UTF-8 (UCS Transformation Format—8-bit).
+     *
+     * <p>Every implementation of the Java platform is required to support UTF-8 (see {@link Charset}).</p>
+     */
+    public static final Charset UTF_8 = Charset.forName("UTF-8");
+
     public static <T> boolean exists(Iterable<? extends T> collection, Predicate<? super T> predicate) {
         for (T item : collection) {
@@ -436 +443 @@
      */
     public static String md5Hex(String data) {
-        byte[] byteData = null;
-        try {
-            byteData = data.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException();
-        }
+        byte[] byteData = data.getBytes(UTF_8);
         MessageDigest md = null;
         try {
@@ -707 +709 @@
      */
     public static BufferedReader openURLReaderAndDecompress(final URL url, final boolean decompress) throws IOException {
-        return new BufferedReader(new InputStreamReader(openURLAndDecompress(url, decompress), "utf-8"));
+        return new BufferedReader(new InputStreamReader(openURLAndDecompress(url, decompress), UTF_8));
     }