Changeset 3826 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

Timestamp:

2011-01-28T00:49:15+01:00 (14 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/data/imagery/ImageryLayerInfo.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -20 +20 @@
 
 public class ImageryLayerInfo {
+
     public static final ImageryLayerInfo instance = new ImageryLayerInfo();
     ArrayList<ImageryInfo> layers = new ArrayList<ImageryInfo>();
     ArrayList<ImageryInfo> defaultLayers = new ArrayList<ImageryInfo>();
-    private final static String[] DEFAULT_LAYER_SITES
-    = { "http://josm.openstreetmap.de/maps"};
+
+    private final static String[] DEFAULT_LAYER_SITES = { 
+        "http://josm.openstreetmap.de/maps" 
+    };
 
     public void load() {
@@ -32 +35 @@
         for(Collection<String> c : Main.pref.getArray("imagery.layers",
                 Collections.<Collection<String>>emptySet())) {
-            layers.add(new ImageryInfo(c));
+            add(new ImageryInfo(c));
         }
 
@@ -60 +63 @@
                         String url = val[2];
                         String eulaAcceptanceRequired = null;
+
                         if (val.length == 4) {
                             // 4th parameter optional for license agreement (EULA)
                             eulaAcceptanceRequired = val[3];
                         }
+
                         defaultLayers.add(new ImageryInfo(name, url, eulaAcceptanceRequired));
 
-                        if(force) {
+                        if (force) {
                             defaultsSave.add(url);
-                            if(!defaults.contains(url)) {
-                                for(ImageryInfo i : layers) {
-                                    if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getURL()))
-                                            || url.equals(i.getFullURL())) {
+                            if (!defaults.contains(url)) {
+                                for (ImageryInfo i : layers) {
+                                    if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getUrl()))
+                                            || url.equals(i.getFullUrl())) {
                                         force = false;
                                     }
                                 }
-                                if(force) {
-                                    layers.add(new ImageryInfo(name, url));
+                                if (force) {
+                                    add(new ImageryInfo(name, url));
                                 }
                             }