Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 19120)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 19121)
@@ -444,5 +444,5 @@
 
         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) {
Index: /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 19120)
+++ /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java	(revision 19121)
@@ -253,5 +253,5 @@
         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();
Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 19120)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 19121)
@@ -15,5 +15,4 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -1139,10 +1138,5 @@
      */
     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,10 +1153,5 @@
      */
     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);
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 19120)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 19121)
@@ -130,5 +130,5 @@
             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);