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

Timestamp:

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

Files:

• PluginListParser.java (modified) (4 diffs)
• ReadRemotePluginInformationTask.java (modified) (5 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;

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

@@ -17 +17 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -174 +173 @@
                 connection.setRequestProperty("Accept-Charset", "utf-8");
             }
-            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
             StringBuilder sb = new StringBuilder();
             while ((line = in.readLine()) != null) {
@@ -207 +206 @@
             try {
                 String line;
-                err = new BufferedReader(new InputStreamReader(errStream, "UTF-8"));
+                err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8));
                 while ((line = err.readLine()) != null) {
                     sb.append(line).append("\n");
@@ -319 +318 @@
             File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);
             getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
-            writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), "utf-8"));
+            writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), Utils.UTF_8));
             writer.write(list);
         } catch(IOException e) {
@@ -363 +362 @@
         try {
             getProgressMonitor().subTask(tr("Parsing plugin list from site ''{0}''", site));
-            InputStream in = new ByteArrayInputStream(doc.getBytes("UTF-8"));
+            InputStream in = new ByteArrayInputStream(doc.getBytes(Utils.UTF_8));
             List<PluginInformation> pis = new PluginListParser().parse(in);
             availablePlugins.addAll(filterDeprecatedPlugins(pis));
-        } catch (UnsupportedEncodingException e) {
-            Main.error(tr("Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));
-            e.printStackTrace();
         } catch (PluginListParseException e) {
             Main.error(tr("Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));