Changeset 13457 in josm for trunk

Timestamp:

2018-02-25T01:21:11+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15985 - fix handling of relative links in help browser

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) (3 diffs)

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

@@ -18 +18 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
@@ -617 +619 @@
                 return null;
             String s = (String) value;
-            if (s.matches("#.*"))
-                return s.substring(1);
+            Matcher m = Pattern.compile("(?:"+url+")?#(.+)").matcher(s);
+            if (m.matches())
+                return m.group(1);
             return null;
         }
@@ -639 +642 @@
                 } else {
                     HelpAwareOptionPane.showOptionDialog(
-                            Main.parent,
+                            instance,
                             tr("Failed to open help page. The target URL is empty."),
                             tr("Failed to open help page"),