Changeset 14442 in josm for trunk/src/org

Timestamp:

2018-11-22T00:50:48+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17016 - catch error when entering bad WMS URL

File:

• trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java (modified) (2 diffs)

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

@@ -232 +232 @@
     /**
      * Adds a WMS Layer with given title and URL
-     * @param title Name of the layer as it will shop up in the layer manager
+     * @param title Name of the layer as it will show up in the layer manager
      * @param url URL to the WMS server
      * @throws IllegalStateException if imagery time is neither HTML nor WMS
@@ -242 +242 @@
                 info = AddImageryLayerAction.getWMSLayerInfo(info);
             } catch (IOException | WMSGetCapabilitiesException e) {
-                Logging.error(e);
-                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
-                        e.getMessage(), tr("No valid WMS URL or id"), JOptionPane.ERROR_MESSAGE);
+                handleException(e);
                 return;
             }
         }
-        MainApplication.getLayerManager().addLayer(ImageryLayer.create(info));
+        try {
+            MainApplication.getLayerManager().addLayer(ImageryLayer.create(info));
+        } catch (IllegalArgumentException e) {
+            handleException(e);
+        }
+    }
+
+    private static void handleException(Exception e) {
+        Logging.error(e);
+        JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
+                e.getMessage(), tr("No valid WMS URL or id"), JOptionPane.ERROR_MESSAGE);
     }