Changeset 6902 in josm for trunk

Timestamp:

2014-03-08T23:36:09+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9791 - IllegalArgumentException when clicking an imagery link from HOT

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java

@@ -73 +73 @@
         }
         GuiHelper.runInEDT(new Runnable() {
-            @Override public void run() {
-                Main.main.addLayer(ImageryLayer.create(imgInfo));
+            @Override
+            public void run() {
+                try {
+                    Main.main.addLayer(ImageryLayer.create(imgInfo));
+                } catch (IllegalArgumentException e) {
+                    Main.error(e, false);
+                }
             }
         });
@@ -110 +115 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
-        // Nothing to do
+        String url = args.get("url");
+        String type = args.get("type");
+        try {
+            ImageryLayer.create(new ImageryInfo(null, url, type, null, null));
+        } catch (IllegalArgumentException e) {
+            throw new RequestHandlerBadRequestException(e.getMessage(), e);
+        }
     }