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

Timestamp:

2014-08-20T03:07:15+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #8885 (see #4614) - add offline mode with new command line argument --offline which can take one of several of these values (comma separated):

• josm_website: to disable all accesses to JOSM website (when not cached, disables Getting Started page, help, plugin list, styles, imagery, presets, rules)
• osm_api: to disable all accesses to OSM API (disables download, upload, changeset queries, history, user message notification)
• all: alias to disable all values. Currently equivalent to "josm_website,osm_api"

Plus improved javadoc, fixed EDT violations, and fixed a bug with HTTP redirection sent without "Location" header

File:

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

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

@@ -25 +25 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.concurrent.Callable;
@@ -91 +93 @@
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.io.FileWatcher;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -219 +222 @@
     private static final List<String> ERRORS_AND_WARNINGS = Collections.<String>synchronizedList(new ArrayList<String>());
 
+    private static final Set<OnlineResource> OFFLINE_RESOURCES = new HashSet<>();
+
     /**
      * Logging level (5 = trace, 4 = debug, 3 = info, 2 = warn, 1 = error, 0 = none).
@@ -543 +548 @@
         List<Callable<Void>> tasks = new ArrayList<>();
 
-        tasks.add(new InitializationTask(tr("Initializing OSM API")) {
-
-            @Override
-            public void initialize() throws Exception {
-                // We try to establish an API connection early, so that any API
-                // capabilities are already known to the editor instance. However
-                // if it goes wrong that's not critical at this stage.
-                try {
-                    OsmApi.getOsmApi().initialize(null, true);
-                } catch (Exception e) {
-                    Main.warn(getErrorMessage(Utils.getRootCause(e)));
+        if (isOffline(OnlineResource.OSM_API)) {
+            Main.warn(tr("{0} not available (offline mode)", tr("OSM API")));
+        } else {
+            tasks.add(new InitializationTask(tr("Initializing OSM API")) {
+
+                @Override
+                public void initialize() throws Exception {
+                    // We try to establish an API connection early, so that any API
+                    // capabilities are already known to the editor instance. However
+                    // if it goes wrong that's not critical at this stage.
+                    try {
+                        OsmApi.getOsmApi().initialize(null, true);
+                    } catch (Exception e) {
+                        Main.warn(getErrorMessage(Utils.getRootCause(e)));
+                    }
                 }
-            }
-        });
+            });
+        }
 
         tasks.add(new InitializationTask(tr("Initializing validator")) {
@@ -1553 +1562 @@
         return Main.platform instanceof PlatformHookWindows;
     }
+
+    /**
+     * Determines if the given online resource is currently offline.
+     * @param r the online resource
+     * @return {@code true} if {@code r} is offline and should not be accessed
+     * @since 7434
+     */
+    public static boolean isOffline(OnlineResource r) {
+        return OFFLINE_RESOURCES.contains(r) || OFFLINE_RESOURCES.contains(OnlineResource.ALL);
+    }
+
+    /**
+     * Sets the given online resource to offline state.
+     * @param r the online resource
+     * @return {@code true} if {@code r} was not already offline
+     * @since 7434
+     */
+    public static boolean setOffline(OnlineResource r) {
+        return OFFLINE_RESOURCES.add(r);
+    }
+
+    /**
+     * Replies the set of online resources currently offline.
+     * @return the set of online resources currently offline
+     * @since 7434
+     */
+    public static Set<OnlineResource> getOfflineResources() {
+        return new HashSet<>(OFFLINE_RESOURCES);
+    }
 }