Changeset 3986 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-03-13T10:56:58+01:00 (14 years ago)

Author:

mjulius

Message:

fix #6106 - Layers Panel v3966 - Bugs generated and improper display

File:

• trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/Capabilities.java

@@ -26 +26 @@
  *     <imagery>
  *       <blacklist regex=".*\.google\.com/.*"/>
- *       <blacklist regex=".*209\.85\.2\d\d.*"/> 
+ *       <blacklist regex=".*209\.85\.2\d\d.*"/>
  *       <blacklist regex=".*209\.85\.1[3-9]\d.*"/>
  *       <blacklist regex=".*209\.85\.12[89].*"/>
@@ -131 +131 @@
 
     /**
-     * checks if the given URL is blacklisted by one of the of the 
+     * checks if the given URL is blacklisted by one of the of the
      * regular expressions.
      */
@@ -137 +137 @@
     public boolean isOnImageryBlacklist(String url)
     {
-        for (String blacklistRegex : imageryBlacklist) {
-            if (url.matches(blacklistRegex)) {
-                return true;
+        if (url != null){
+            for (String blacklistRegex : imageryBlacklist) {
+                if (url.matches(blacklistRegex))
+                    return true;
             }
         }
@@ -145 +146 @@
     }
 
-    /** 
+    /**
      * returns the full list of blacklist regular expressions.
      */