Changeset 14175 in josm for trunk

Timestamp:

2018-08-21T22:13:05+02:00 (6 years ago)

Author:

wiktorn

Message:

Fix NPE when providing only WMS URL in AddImageryPanel

Closes: #16671

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -182 +182 @@
             }
         } else {
-            info = wms.toImageryInfo(getImageryName(), tree.getSelectedLayers(), (List<String>) null, true); // TODO: ask user about transparency
-            info.setUrl(getWmsUrl());
+            if (wms != null && wms.buildRootUrl() != null) {
+                info = wms.toImageryInfo(getImageryName(), tree.getSelectedLayers(), (List<String>) null, true); // TODO: ask user about transparency
+            } else {
+                info = new ImageryInfo(getImageryName(), getWmsUrl());
+            }
             info.setImageryType(ImageryType.WMS);
         }