Changeset 11626 in josm for trunk/src/org

Timestamp:

2017-02-26T00:56:29+01:00 (8 years ago)

Author:

Don-vip

Message:

see #12313 - fix NPE, checkstyle violations and two failing unit tests

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -67 +67 @@
         putValue("toolbar", "imagery_" + info.getToolbarName());
         putValue("help", ht("/Preferences/Imagery"));
-        setTooltip(info.getToolTipText().replaceAll("</?html>",""));
+        String tooltip = info.getToolTipText();
+        if (tooltip != null) {
+            setTooltip(tooltip.replaceAll("</?html>", ""));
+        }
         this.info = info;
         installAdapters();