Changeset 3986 in josm


Ignore:
Timestamp:
2011-03-13T10:56:58+01:00 (10 years ago)
Author:
mjulius
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/Capabilities.java

    r3934 r3986  
    2626 *     <imagery>
    2727 *       <blacklist regex=".*\.google\.com/.*"/>
    28  *       <blacklist regex=".*209\.85\.2\d\d.*"/> 
     28 *       <blacklist regex=".*209\.85\.2\d\d.*"/>
    2929 *       <blacklist regex=".*209\.85\.1[3-9]\d.*"/>
    3030 *       <blacklist regex=".*209\.85\.12[89].*"/>
     
    131131
    132132    /**
    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
    134134     * regular expressions.
    135135     */
     
    137137    public boolean isOnImageryBlacklist(String url)
    138138    {
    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;
    142143            }
    143144        }
     
    145146    }
    146147
    147     /** 
     148    /**
    148149     * returns the full list of blacklist regular expressions.
    149150     */
Note: See TracChangeset for help on using the changeset viewer.