Changeset 3826 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2011-01-28T00:49:15+01:00 (13 years ago)

Author:

framm

Message:

Add a "blacklisted" property to imagery layers; set this property from a
compiled-in list of regular expressions; disable blacklisted entries in
the Imagery menu.

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (1 diff)

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

@@ -31 +31 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(info.getImageryType() == ImageryType.TMS
-                || info.getImageryType() == ImageryType.BING
-                || (Main.map != null && Main.map.mapView != null
-                        && !Main.map.mapView.getAllLayers().isEmpty()));
+        // never enable blacklisted entries.
+        if (info.isBlacklisted()) {
+            setEnabled(false);
+        } else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING) {
+            setEnabled(true);
+        } else if (Main.map != null && Main.map.mapView != null && !Main.map.mapView.getAllLayers().isEmpty()) {
+            setEnabled(true);
+        } else {
+            setEnabled(false);
+        }
     }
 }