Changeset 19121 in josm

Timestamp:

2024-06-20T16:40:27+02:00 (4 months ago)

Author:

taylor.smock

Message:

See #17858: Replace most calls to StandardCharsets.UTF_8.name() with StandardCharsets.UTF_8

This (in many cases) also removes catches for UnsupportedEncodingException.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java (modified) (1 diff)

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

@@ -444 +444 @@
 
         try (PreferencesWriter writer = new PreferencesWriter(
-                new PrintWriter(prefFile + "_tmp", StandardCharsets.UTF_8.name()), false, defaults)) {
+                new PrintWriter(prefFile + "_tmp", StandardCharsets.UTF_8), false, defaults)) {
             writer.write(settings);
         } catch (SecurityException e) {

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -253 +253 @@
         File cacheFile = createSiteCacheFile(pluginDir, site);
         getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
-        try (PrintWriter writer = new PrintWriter(cacheFile, StandardCharsets.UTF_8.name())) {
+        try (PrintWriter writer = new PrintWriter(cacheFile, StandardCharsets.UTF_8)) {
             writer.write(list);
             writer.flush();

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

@@ -15 +15 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -1139 +1138 @@
      */
     public static String encodeUrl(String s) {
-        final String enc = StandardCharsets.UTF_8.name();
-        try {
-            return URLEncoder.encode(s, enc);
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
+        return URLEncoder.encode(s, StandardCharsets.UTF_8);
     }
 
@@ -1159 +1153 @@
      */
     public static String decodeUrl(String s) {
-        final String enc = StandardCharsets.UTF_8.name();
-        try {
-            return URLDecoder.decode(s, enc);
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
+        return URLDecoder.decode(s, StandardCharsets.UTF_8);
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java

@@ -130 +130 @@
             t.join();
             System.out.flush();
-            assertEquals(expected, baos.toString(StandardCharsets.UTF_8.name()).trim());
+            assertEquals(expected, baos.toString(StandardCharsets.UTF_8).trim());
         } finally {
             System.setOut(old);