Changeset 16426 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

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)

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -21 +21 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -43 +42 @@
 import org.openstreetmap.josm.data.preferences.PreferencesWriter;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.io.OfflineAccessException;
-import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -804 +802 @@
     public Collection<String> getOnlinePluginSites() {
         Collection<String> pluginSites = new ArrayList<>(getPluginSites());
-        for (Iterator<String> it = pluginSites.iterator(); it.hasNext();) {
-            try {
-                OnlineResource.JOSM_WEBSITE.checkOfflineAccess(it.next(), Config.getUrls().getJOSMWebsite());
-            } catch (OfflineAccessException ex) {
-                Logging.log(Logging.LEVEL_WARN, ex);
-                it.remove();
-            }
-        }
+        pluginSites.removeIf(NetworkManager::isOffline);
         return pluginSites;
     }