Changeset 6642 in josm for trunk/src/org/openstreetmap/josm/tools/WikiReader.java

Timestamp:

2014-01-06T15:57:41+01:00 (10 years ago)

Author:

Don-vip

Message:

Improve handling of network errors at startup, suggest to change proxy settings

File:

• trunk/src/org/openstreetmap/josm/tools/WikiReader.java (modified) (3 diffs)

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

@@ -18 +18 @@
     private final String baseurl;
 
+    /**
+     * Constructs a new {@code WikiReader} for the given base URL.
+     * @param baseurl The wiki base URL
+     */
     public WikiReader(String baseurl) {
         this.baseurl = baseurl;
@@ -80 +84 @@
 
     private String readLang(URL url) throws IOException {
-        BufferedReader in = Utils.openURLReader(url);
+        BufferedReader in;
+        try {
+            in = Utils.openURLReader(url);
+        } catch (IOException e) {
+            Main.addNetworkError(url, Utils.getRootCause(e));
+            throw e;
+        }
         try {
             return readFromTrac(in, url);
@@ -124 +134 @@
                 // add a border="0" attribute to images, otherwise the internal help browser
                 // will render a thick  border around images inside an <a> element
-                //
                 b += line.replaceAll("<img ", "<img border=\"0\" ")
                          .replaceAll("<span class=\"icon\">.</span>", "")