Changeset 16426 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2020-05-16T20:59:34+02:00 (4 years ago)

Author:

simon04

Message:

see #18712 - Add NetworkManager.isOffline(String) to test offline status of given URL

Deprecates OnlineResource.checkOfflineAccess(String, String)

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• CachedAttributionBingAerialTileSource.java (modified) (2 diffs)
• ImageryLayerInfo.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.CacheCustomContent;
-import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
@@ -63 +63 @@
 
         @Override
-        protected void checkOfflineAccess() {
+        protected boolean isOffline() {
             try {
-                String attributionUrl = getAttributionUrl().toExternalForm();
-                OnlineResource.ALL.checkOfflineAccess(attributionUrl, attributionUrl);
+                return NetworkManager.isOffline(getAttributionUrl().toExternalForm());
             } catch (MalformedURLException e) {
                 Logging.error(e);
+                return false;
             }
         }

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

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.OfflineAccessException;
-import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.imagery.ImageryReader;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -159 +158 @@
 
         protected void loadSource(String source) {
-            boolean online = true;
-            try {
-                OnlineResource.JOSM_WEBSITE.checkOfflineAccess(source, Config.getUrls().getJOSMWebsite());
-            } catch (OfflineAccessException e) {
-                Logging.log(Logging.LEVEL_WARN, e);
-                online = false;
-            }
+            boolean online = !NetworkManager.isOffline(source);
             if (clearCache && online) {
                 CachedFile.cleanup(source);