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

Timestamp:

2011-10-20T14:12:47+02:00 (15 years ago)

Author:

Don-vip

Message:

fix #6982 - broken TMS url leads to exceptions

File:

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

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

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -25 +27 @@
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled()) return;
-        Main.main.addLayer(ImageryLayer.create(info));
+        try {
+            Main.main.addLayer(ImageryLayer.create(info));
+        } catch (IllegalArgumentException ex) {
+            if (ex.getMessage() == null || ex.getMessage().isEmpty()) {
+                throw ex;
+            } else {
+                JOptionPane.showMessageDialog(Main.parent,
+                        ex.getMessage(), tr("Error"),
+                        JOptionPane.ERROR_MESSAGE);
+            }
+        }
     }