Changeset 16426 in josm for trunk/src/org/openstreetmap/josm/data/imagery
- Timestamp:
- 2020-05-16T20:59:34+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/imagery
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java
r14746 r16426 15 15 import org.openstreetmap.josm.gui.util.GuiHelper; 16 16 import org.openstreetmap.josm.io.CacheCustomContent; 17 import org.openstreetmap.josm.io. OnlineResource;17 import org.openstreetmap.josm.io.NetworkManager; 18 18 import org.openstreetmap.josm.tools.HttpClient; 19 19 import org.openstreetmap.josm.tools.Logging; … … 63 63 64 64 @Override 65 protected void checkOfflineAccess() {65 protected boolean isOffline() { 66 66 try { 67 String attributionUrl = getAttributionUrl().toExternalForm(); 68 OnlineResource.ALL.checkOfflineAccess(attributionUrl, attributionUrl); 67 return NetworkManager.isOffline(getAttributionUrl().toExternalForm()); 69 68 } catch (MalformedURLException e) { 70 69 Logging.error(e); 70 return false; 71 71 } 72 72 } -
trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
r14214 r16426 22 22 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 23 23 import org.openstreetmap.josm.io.CachedFile; 24 import org.openstreetmap.josm.io.OfflineAccessException; 25 import org.openstreetmap.josm.io.OnlineResource; 24 import org.openstreetmap.josm.io.NetworkManager; 26 25 import org.openstreetmap.josm.io.imagery.ImageryReader; 27 26 import org.openstreetmap.josm.spi.preferences.Config; … … 159 158 160 159 protected void loadSource(String source) { 161 boolean online = true; 162 try { 163 OnlineResource.JOSM_WEBSITE.checkOfflineAccess(source, Config.getUrls().getJOSMWebsite()); 164 } catch (OfflineAccessException e) { 165 Logging.log(Logging.LEVEL_WARN, e); 166 online = false; 167 } 160 boolean online = !NetworkManager.isOffline(source); 168 161 if (clearCache && online) { 169 162 CachedFile.cleanup(source);
Note:
See TracChangeset
for help on using the changeset viewer.