Changeset 3986 in josm
- Timestamp:
- 2011-03-13T10:56:58+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/Capabilities.java
r3934 r3986 26 26 * <imagery> 27 27 * <blacklist regex=".*\.google\.com/.*"/> 28 * <blacklist regex=".*209\.85\.2\d\d.*"/> 28 * <blacklist regex=".*209\.85\.2\d\d.*"/> 29 29 * <blacklist regex=".*209\.85\.1[3-9]\d.*"/> 30 30 * <blacklist regex=".*209\.85\.12[89].*"/> … … 131 131 132 132 /** 133 * checks if the given URL is blacklisted by one of the of the 133 * checks if the given URL is blacklisted by one of the of the 134 134 * regular expressions. 135 135 */ … … 137 137 public boolean isOnImageryBlacklist(String url) 138 138 { 139 for (String blacklistRegex : imageryBlacklist) { 140 if (url.matches(blacklistRegex)) { 141 return true; 139 if (url != null){ 140 for (String blacklistRegex : imageryBlacklist) { 141 if (url.matches(blacklistRegex)) 142 return true; 142 143 } 143 144 } … … 145 146 } 146 147 147 /** 148 /** 148 149 * returns the full list of blacklist regular expressions. 149 150 */
Note:
See TracChangeset
for help on using the changeset viewer.