Changeset 11168 in josm

Timestamp:

2016-10-26T14:02:13+02:00 (8 years ago)

Author:

simon04

Message:

fix #13828 - Fix IAE when adding WMS layer with invalid URL

The fix involves checking the URL when constructing WMSLayer instead when calling getTileSource

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -61 +62 @@
     public WMSLayer(ImageryInfo info) {
         super(info);
+        CheckParameterUtil.ensureThat(info.getImageryType() == ImageryType.WMS, "ImageryType is WMS");
+        CheckParameterUtil.ensureParameterNotNull(info.getUrl(), "info.url");
+        TemplatedWMSTileSource.checkUrl(info.getUrl());
         this.supportedProjections = new TreeSet<>(info.getServerProjections());
     }
@@ -82 +86 @@
     @Override
     protected AbstractWMSTileSource getTileSource() {
-        if (info.getImageryType() == ImageryType.WMS && info.getUrl() != null) {
-            TemplatedWMSTileSource.checkUrl(info.getUrl());
-            AbstractWMSTileSource tileSource = new TemplatedWMSTileSource(info);
-            info.setAttribution(tileSource);
-            return tileSource;
-        }
-        return null;
+        AbstractWMSTileSource tileSource = new TemplatedWMSTileSource(info);
+        info.setAttribution(tileSource);
+        return tileSource;
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java

@@ -38 +38 @@
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13828">Bug #13828</a>.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testTicket13828() {
+        new WMSLayer(new ImageryInfo("TMS", "http://203.159.29.217/try2/{z}/{x}/{y}.png"));
+    }
 }