Changeset 14121 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2018-08-11T17:51:12+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods related to network features. New NetworkManager class

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36 +34 @@
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.io.FileWatcher;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -80 +79 @@
      */
     public static final FileWatcher fileWatcher = new FileWatcher();
-
-    private static final Map<String, Throwable> NETWORK_ERRORS = new HashMap<>();
-
-    private static final Set<OnlineResource> OFFLINE_RESOURCES = EnumSet.noneOf(OnlineResource.class);
 
     /**
@@ -423 +418 @@
      * @param t The network error
      * @return The previous error associated to the given resource, if any. Can be {@code null}
+     * @deprecated Use {@link NetworkManager#addNetworkError(URL, Throwable)}
      * @since 6642
      */
+    @Deprecated
     public static Throwable addNetworkError(URL url, Throwable t) {
-        if (url != null && t != null) {
-            Throwable old = addNetworkError(url.toExternalForm(), t);
-            if (old != null) {
-                Logging.warn("Already here "+old);
-            }
-            return old;
-        }
-        return null;
+        return NetworkManager.addNetworkError(url, t);
     }
 
@@ -443 +433 @@
      * @param t The network error
      * @return The previous error associated to the given resource, if any. Can be {@code null}
+     * @deprecated Use {@link NetworkManager#addNetworkError(String, Throwable)}
      * @since 6642
      */
+    @Deprecated
     public static Throwable addNetworkError(String url, Throwable t) {
-        if (url != null && t != null) {
-            return NETWORK_ERRORS.put(url, t);
-        }
-        return null;
+        return NetworkManager.addNetworkError(url, t);
     }
 
@@ -455 +444 @@
      * Returns the network errors that occured until now.
      * @return the network errors that occured until now, indexed by URL
+     * @deprecated Use {@link NetworkManager#getNetworkErrors}
      * @since 6639
      */
+    @Deprecated
     public static Map<String, Throwable> getNetworkErrors() {
-        return new HashMap<>(NETWORK_ERRORS);
+        return NetworkManager.getNetworkErrors();
     }
 
     /**
      * Clears the network errors cache.
+     * @deprecated Use {@link NetworkManager#clearNetworkErrors}
      * @since 12011
      */
+    @Deprecated
     public static void clearNetworkErrors() {
-        NETWORK_ERRORS.clear();
+        NetworkManager.clearNetworkErrors();
     }
 
@@ -546 +539 @@
      * @param r the online resource
      * @return {@code true} if {@code r} is offline and should not be accessed
+     * @deprecated Use {@link NetworkManager#isOffline}
      * @since 7434
      */
+    @Deprecated
     public static boolean isOffline(OnlineResource r) {
-        return OFFLINE_RESOURCES.contains(r) || OFFLINE_RESOURCES.contains(OnlineResource.ALL);
+        return NetworkManager.isOffline(r);
     }
 
@@ -556 +551 @@
      * @param r the online resource
      * @return {@code true} if {@code r} was not already offline
+     * @deprecated Use {@link NetworkManager#setOffline}
      * @since 7434
      */
+    @Deprecated
     public static boolean setOffline(OnlineResource r) {
-        return OFFLINE_RESOURCES.add(r);
+        return NetworkManager.setOffline(r);
     }
 
@@ -566 +563 @@
      * @param r the online resource
      * @return {@code true} if {@code r} was offline
+     * @deprecated Use {@link NetworkManager#setOnline}
      * @since 8506
      */
+    @Deprecated
     public static boolean setOnline(OnlineResource r) {
-        return OFFLINE_RESOURCES.remove(r);
+        return NetworkManager.setOnline(r);
     }
 
@@ -575 +574 @@
      * Replies the set of online resources currently offline.
      * @return the set of online resources currently offline
+     * @deprecated Use {@link NetworkManager#getOfflineResources}
      * @since 7434
      */
+    @Deprecated
     public static Set<OnlineResource> getOfflineResources() {
-        return EnumSet.copyOf(OFFLINE_RESOURCES);
+        return NetworkManager.getOfflineResources();
     }
 }