Changeset 13388 in josm for trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

Timestamp:

2018-02-07T00:16:59+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15880 - robustness to unsupported projections

File:

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

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

@@ -40 +40 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
 /**
@@ -136 +137 @@
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled()) return;
+        ImageryLayer layer = null;
         try {
             final ImageryInfo infoToAdd = convertImagery(info);
             if (infoToAdd != null) {
-                getLayerManager().addLayer(ImageryLayer.create(infoToAdd));
+                layer = ImageryLayer.create(infoToAdd);
+                getLayerManager().addLayer(layer);
                 AlignImageryPanel.addNagPanelIfNeeded(infoToAdd);
             }
-        } catch (IllegalArgumentException ex) {
+        } catch (IllegalArgumentException | ReportedException ex) {
             if (ex.getMessage() == null || ex.getMessage().isEmpty() || GraphicsEnvironment.isHeadless()) {
                 throw ex;
             } else {
-                JOptionPane.showMessageDialog(Main.parent,
-                        ex.getMessage(), tr("Error"),
-                        JOptionPane.ERROR_MESSAGE);
+                Logging.error(ex);
+                JOptionPane.showMessageDialog(Main.parent, ex.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+                if (layer != null) {
+                    getLayerManager().removeLayer(layer);
+                }
             }
         }