Changeset 5936 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-05-07T13:46:58+02:00 (11 years ago)

Author:

stoecker

Message:

fix #8685 - wiki browser links not working

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java

@@ -47 +47 @@
         BufferedReader in = null;
         try {
-            con = Utils.openHttpConnection(new URL(helpTopicUrl));
+            URL u = new URL(helpTopicUrl);
+            con = Utils.openHttpConnection(u);
             con.connect();
             in = new BufferedReader(new InputStreamReader(con.getInputStream(),"utf-8"));
-            return prepareHelpContent(in, dotest);
+            return prepareHelpContent(in, dotest, u);
         } catch(MalformedURLException e) {
             throw new HelpContentReaderException(e);
@@ -79 +80 @@
      * @throws HelpContentReaderException thrown if an exception occurs
      * @throws MissingHelpContentException thrown, if the content read isn't a help page
+     * @since 5935
      */
-    protected String prepareHelpContent(BufferedReader in, boolean dotest) throws HelpContentReaderException {
+    protected String prepareHelpContent(BufferedReader in, boolean dotest, URL url) throws HelpContentReaderException {
         String s = "";
         try {
-            s = readFromTrac(in);
+            s = readFromTrac(in, url);
         } catch(IOException e) {
             throw new HelpContentReaderException(e);