Changeset 6552 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java

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.

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins;
+
+import org.openstreetmap.josm.tools.Utils;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -9 +11 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.util.LinkedList;
 import java.util.List;
@@ -35 +36 @@
         try {
             return new PluginInformation(
-                    new ByteArrayInputStream(manifest.getBytes("utf-8")),
+                    new ByteArrayInputStream(manifest.getBytes(Utils.UTF_8)),
                     name.substring(0, name.length() - 4),
                     url
                     );
-        } catch(UnsupportedEncodingException e) {
-            throw new PluginListParseException(tr("Failed to create plugin information from manifest for plugin ''{0}''", name), e);
         } catch (PluginException e) {
             throw new PluginListParseException(tr("Failed to create plugin information from manifest for plugin ''{0}''", name), e);
@@ -61 +60 @@
         BufferedReader r = null;
         try {
-            r = new BufferedReader(new InputStreamReader(in, "utf-8"));
+            r = new BufferedReader(new InputStreamReader(in, Utils.UTF_8));
             String name = null;
             String url = null;