Changeset 7759 in josm for trunk/src

Timestamp:

2014-12-01T20:08:41+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10798 - throw exception with invalid imagery types

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -301 +301 @@
     }
 
+    /**
+     * Constructs a new {@code ImageryInfo} with given name, url, extended and EULA URLs.
+     * @param name The entry name
+     * @param url The entry URL
+     * @param type The entry imagery type. If null, WMS will be used as default
+     * @param eulaAcceptanceRequired The EULA URL
+     * @throws IllegalArgumentException if type refers to an unknown imagery type
+     */
     public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies) {
         this.name=name;
@@ -309 +317 @@
         if (t != null) {
             this.imageryType = t;
+        } else if (type != null && !type.trim().isEmpty()) {
+            throw new IllegalArgumentException("unknown type: "+type);
         }
     }