Changeset 14807 in josm for trunk

Timestamp:

2019-02-24T22:43:26+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #17338 - NPE

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/help/HyperlinkHandler.java (added)
• src/org/openstreetmap/josm/gui/help/IHelpBrowser.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/help/HyperlinkHandlerTest.java (added)

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

@@ -9 +9 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.WindowAdapter;
@@ -17 +16 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
@@ -32 +29 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
-import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
-import javax.swing.text.Element;
-import javax.swing.text.SimpleAttributeSet;
-import javax.swing.text.html.HTML.Tag;
-import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.StyleSheet;
 
@@ -177 +167 @@
         help.setEditorKit(kit);
         help.setEditable(false);
-        help.addHyperlinkListener(new HyperlinkHandler());
+        help.addHyperlinkListener(new HyperlinkHandler(this, help));
         help.setContentType("text/html");
         history = new HelpBrowserHistory(this);
@@ -247 +237 @@
     public String getUrl() {
         return url;
+    }
+
+    @Override
+    public void setUrl(String url) {
+        this.url = url;
     }
 
@@ -564 +559 @@
     }
 
-    class HyperlinkHandler implements HyperlinkListener {
-
-        /**
-         * Scrolls the help browser to the element with id <code>id</code>
-         *
-         * @param id the id
-         * @return true, if an element with this id was found and scrolling was successful; false, otherwise
-         */
-        protected boolean scrollToElementWithId(String id) {
-            Document d = help.getDocument();
-            if (d instanceof HTMLDocument) {
-                HTMLDocument doc = (HTMLDocument) d;
-                Element element = doc.getElement(id);
-                try {
-                    // Deprecated API to replace only when migrating to Java 9 (replacement not available in Java 8)
-                    @SuppressWarnings("deprecation")
-                    Rectangle r = help.modelToView(element.getStartOffset());
-                    if (r != null) {
-                        Rectangle vis = help.getVisibleRect();
-                        r.height = vis.height;
-                        help.scrollRectToVisible(r);
-                        return true;
-                    }
-                } catch (BadLocationException e) {
-                    Logging.warn(tr("Bad location in HTML document. Exception was: {0}", e.toString()));
-                    Logging.error(e);
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Checks whether the hyperlink event originated on a &lt;a ...&gt; element with
-         * a relative href consisting of a URL fragment only, i.e.
-         * &lt;a href="#thisIsALocalFragment"&gt;. If so, replies the fragment, i.e. "thisIsALocalFragment".
-         *
-         * Otherwise, replies <code>null</code>
-         *
-         * @param e the hyperlink event
-         * @return the local fragment or <code>null</code>
-         */
-        protected String getUrlFragment(HyperlinkEvent e) {
-            AttributeSet set = e.getSourceElement().getAttributes();
-            Object value = set.getAttribute(Tag.A);
-            if (!(value instanceof SimpleAttributeSet))
-                return null;
-            SimpleAttributeSet atts = (SimpleAttributeSet) value;
-            value = atts.getAttribute(javax.swing.text.html.HTML.Attribute.HREF);
-            if (value == null)
-                return null;
-            String s = (String) value;
-            Matcher m = Pattern.compile("(?:"+url+")?#(.+)").matcher(s);
-            if (m.matches())
-                return m.group(1);
-            return null;
-        }
-
-        @Override
-        public void hyperlinkUpdate(HyperlinkEvent e) {
-            if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED)
-                return;
-            if (e.getURL() == null || e.getURL().toExternalForm().startsWith(url+'#')) {
-                // Probably hyperlink event on a an A-element with a href consisting of a fragment only, i.e. "#ALocalFragment".
-                String fragment = getUrlFragment(e);
-                if (fragment != null) {
-                    // first try to scroll to an element with id==fragment. This is the way
-                    // table of contents are built in the JOSM wiki. If this fails, try to
-                    // scroll to a <A name="..."> element.
-                    //
-                    if (!scrollToElementWithId(fragment)) {
-                        help.scrollToReference(fragment);
-                    }
-                } else {
-                    HelpAwareOptionPane.showOptionDialog(
-                            instance,
-                            tr("Failed to open help page. The target URL is empty."),
-                            tr("Failed to open help page"),
-                            JOptionPane.ERROR_MESSAGE,
-                            null, /* no icon */
-                            null, /* standard options, just OK button */
-                            null, /* default is standard */
-                            null /* no help context */
-                    );
-                }
-            } else if (e.getURL().toExternalForm().endsWith("action=edit")) {
-                OpenBrowser.displayUrl(e.getURL().toExternalForm());
-            } else {
-                url = e.getURL().toExternalForm();
-                if (url.startsWith(HelpUtil.getWikiBaseUrl())) {
-                    openUrl(url);
-                } else {
-                    OpenBrowser.displayUrl(url);
-                }
-            }
-        }
-    }
-
     @Override
     public HelpBrowserHistory getHistory() {

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

@@ -13 +13 @@
      */
     String getUrl();
+
+    /**
+     * Sets the current URL.
+     * @param url the current URL
+     * @since 14807
+     */
+    void setUrl(String url);
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java

@@ -61 +61 @@
 
             @Override
+            public void setUrl(String url) {
+                this.url = url;
+            }
+
+            @Override
             public HelpBrowserHistory getHistory() {
                 return history;