Changeset 8068 in josm for trunk/src/org

Timestamp:

2015-02-15T19:55:12+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #11076 - robustness to unsupported WMS rectifier imagery types

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MapRectifierWMSmenuAction.java (modified) (2 diffs)
• gui/layer/WMSLayer.java (modified) (1 diff)

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

@@ -187 +187 @@
                 // Just set the URL and hope everything works out
                 if(s.wmsUrl.isEmpty()) {
-                    addWMSLayer(s.name + " (" + text + ")", text);
-                    break outer;
+                    try {
+                        addWMSLayer(s.name + " (" + text + ")", text);
+                        break outer;
+                    } catch (IllegalStateException ex) {
+                        Main.error(ex.getMessage());
+                    }
                 }
 
@@ -226 +230 @@
      * @param title Name of the layer as it will shop up in the layer manager
      * @param url URL to the WMS server
+     * @throws IllegalStateException if imagery time is neither HTML nor WMS
+     * @see WMSLayer#checkGrabberType
      */
     private void addWMSLayer(String title, String url) {
-        Main.main.addLayer(new WMSLayer(new ImageryInfo(title, url)));
+        WMSLayer layer = new WMSLayer(new ImageryInfo(title, url));
+        layer.checkGrabberType();
+        Main.main.addLayer(layer);
     }
 

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

@@ -1021 +1021 @@
     }
 
+    /**
+     * Checks that WMS layer is a grabber-compatible one (HTML or WMS).
+     * @throws IllegalStateException if imagery time is neither HTML nor WMS
+     * @since 8068
+     */
+    public void checkGrabberType() {
+        ImageryType it = getInfo().getImageryType();
+        if (!ImageryType.HTML.equals(it) && !ImageryType.WMS.equals(it))
+            throw new IllegalStateException("getGrabber() called for non-WMS layer type");
+    }
+
     protected WMSGrabber getGrabber(boolean localOnly) {
+        checkGrabberType();
         if (getInfo().getImageryType() == ImageryType.HTML)
             return new HTMLGrabber(Main.map.mapView, this, localOnly);
-        else if (getInfo().getImageryType() == ImageryType.WMS)
+        else
             return new WMSGrabber(Main.map.mapView, this, localOnly);
-        else throw new IllegalStateException("getGrabber() called for non-WMS layer type");
     }