Changeset 31849 in osm for applications

Timestamp:

2015-12-22T18:51:39+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: use Utils#encodeUrl

File:

• applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (modified) (5 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -80 +80 @@
                     + "?lang=" + wikipediaLang
                     + "&depth=" + depth
-                    + "&cat=" + encodeURL(category);
+                    + "&cat=" + Utils.encodeUrl(category);
             Main.info("Wikipedia: GET " + url);
             try (final InputStream in = Utils.openURL(new URL(url));
@@ -123 +123 @@
 
                 try (final OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), "UTF-8")) {
-                        out.write("articles=" + encodeURL(Utils.join(",", articleNames)));
+                    out.write("articles=" + Utils.encodeUrl(Utils.join(",", articleNames)));
                 }
 
@@ -304 +304 @@
                 final String url = "https://tools.wmflabs.org/wiwosm/osmjson/getGeoJSON.php?action=check"
                         + "&lang=" + wikipediaLang
-                        + "&article=" + encodeURL(wikipediaArticle);
+                        + "&article=" + Utils.encodeUrl(wikipediaArticle);
                 Main.info("Wikipedia: GET " + url);
                 try (final InputStream in = Utils.openURL(new URL(url));
@@ -325 +325 @@
         public String getBrowserUrl() {
             return "https://" + wikipediaLang + ".wikipedia.org/wiki/"
-                    + encodeURL(wikipediaArticle.replace(" ", "_"));
+                    + Utils.encodeUrl(wikipediaArticle.replace(" ", "_"));
         }
 
@@ -347 +347 @@
     }
 
-    public static String encodeURL(String url) {
-        try {
-            return URLEncoder.encode(url, "UTF-8");
-        } catch (UnsupportedEncodingException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
     public static <T> List<List<T>> partitionList(final List<T> list, final int size) {
         return new AbstractList<List<T>>() {