Changeset 9168 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-12-26T23:41:52+01:00 (8 years ago)

Author:

simon04

Message:

see #12231 - Uniform access to HTTP resources

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• HttpClient.java (added)
• WikiReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/WikiReader.java

@@ -53 +53 @@
     public String read(String url) throws IOException {
         URL u = new URL(url);
-        try (BufferedReader in = Utils.openURLReader(u)) {
+        try (BufferedReader in = HttpClient.create(u).connect().getContentReader()) {
             boolean txt = url.endsWith("?format=txt");
             if (url.startsWith(getBaseUrlWiki()) && !txt)
@@ -98 +98 @@
 
     private String readLang(URL url) throws IOException {
-        try (BufferedReader in = Utils.openURLReader(url)) {
+        try (BufferedReader in = HttpClient.create(url).connect().getContentReader()) {
             return readFromTrac(in, url);
-        } catch (IOException e) {
-            Main.addNetworkError(url, Utils.getRootCause(e));
-            throw e;
         }
     }