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

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

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19121 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: taylor.smock

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

@@ -443,7 +443,7 @@ protected void save(File prefFile, Stream<Entry<String, Setting<?>>> settings, b
         }
 
         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) {
             throw new IOException(e);

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

@@ -252,7 +252,7 @@ protected void cachePluginList(String site, String list) {
         }
         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();
         } catch (IOException e) {

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

@@ -14,7 +14,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -1138,12 +1137,7 @@ public static String fixURLQuery(String url) {
      * @since 8304
      */
     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);
     }
 
     /**
@@ -1158,12 +1152,7 @@ public static String encodeUrl(String s) {
      * @since 8304
      */
     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);
     }
 
     /**

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

@@ -129,7 +129,7 @@ private void testShow(final String arg, String expected) throws InterruptedExcep
             t.start();
             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);
         }