Changeset 31851 in osm for applications/editors/josm/plugins/wikipedia

Timestamp:

2015-12-22T19:02:25+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: use Utils#decodeUrl

File:

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

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

@@ -5 +5 @@
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -173 +170 @@
                     "?action=query" +
                     "&prop=langlinks" +
-                    "&titles=" + URLEncoder.encode(article, "UTF-8") +
+                    "&titles=" + Utils.encodeUrl(article) +
                     "&lllimit=500" +
                     "&format=xml";
@@ -206 +203 @@
             }
             // decode URL for nicer value
-            url = decodeURL(url);
+            url = Utils.decodeUrl(url);
             // extract Wikipedia language and
             final Matcher m = Pattern.compile("(https?:)?//(\\w*)\\.wikipedia\\.org/wiki/(.*)").matcher(url);
@@ -224 +221 @@
                 //wikipedia=[lang]:[article]
                 //wikipedia:[lang]=[lang]:[article]
-                final String[] item = decodeURL(value).split(":", 2);
+                final String[] item = Utils.decodeUrl(value).split(":", 2);
                 final String article = item[1].replace("_", " ");
                 return new WikipediaLangArticle(item[0], article);
@@ -231 +228 @@
                 //wikipedia:[lang]=[article]
                 final String lang = key.split(":", 2)[1];
-                final String[] item = decodeURL(value).split(":", 2);
+                final String[] item = Utils.decodeUrl(value).split(":", 2);
                 final String article = item[item.length == 2 ? 1 : 0].replace("_", " ");
                 return new WikipediaLangArticle(lang, article);
@@ -341 +338 @@
     }
 
-    public static String decodeURL(String url) {
-        try {
-            return URLDecoder.decode(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>>() {