Changeset 7434 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2014-08-20T03:07:15+02:00 (9 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

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (3 diffs)
• ReadRemotePluginInformationTask.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -63 +63 @@
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.io.OfflineAccessException;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
@@ -303 +305 @@
      */
     public static boolean checkAndConfirmPluginUpdate(Component parent) {
+        if (!checkOfflineAccess()) {
+            Main.info(tr("{0} not available (offline mode)", tr("Plugin update")));
+            return false;
+        }
         String message = null;
         String togglePreferenceKey = null;
@@ -403 +409 @@
         }
         return ret == 0;
+    }
+
+    private static boolean checkOfflineAccess() {
+        if (Main.isOffline(OnlineResource.ALL)) {
+            return false;
+        }
+        if (Main.isOffline(OnlineResource.JOSM_WEBSITE)) {
+            for (String updateSite : Main.pref.getPluginSites()) {
+                try {
+                    OnlineResource.JOSM_WEBSITE.checkOfflineAccess(updateSite, Main.getJOSMWebsite());
+                } catch (OfflineAccessException e) {
+                    if (Main.isTraceEnabled()) {
+                        Main.trace(e.getMessage());
+                    }
+                    return false;
+                }
+            }
+        }
+        return true;
     }
 

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -60 +60 @@
     protected enum CacheType {PLUGIN_LIST, ICON_LIST}
 
-    protected final void init(Collection<String> sites, boolean displayErrMsg){
+    protected final void init(Collection<String> sites, boolean displayErrMsg) {
         this.sites = sites;
         if (sites == null) {
@@ -68 +68 @@
         this.displayErrMsg = displayErrMsg;
     }
-    /**
-     * Creates the task
+
+    /**
+     * Constructs a new {@code ReadRemotePluginInformationTask}.
      *
      * @param sites the collection of download sites. Defaults to the empty collection if null.
@@ -79 +80 @@
 
     /**
-     * Creates the task
+     * Constructs a new {@code ReadRemotePluginInformationTask}.
      *
      * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null
@@ -104 +105 @@
 
     /**
-     * Creates the file name for the cached plugin list and the icon cache
-     * file.
+     * Creates the file name for the cached plugin list and the icon cache file.
      *
      * @param site the name of the site
@@ -403 +403 @@
             siteCacheFiles.remove(createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST));
             siteCacheFiles.remove(createSiteCacheFile(pluginDir, site, CacheType.ICON_LIST));
-            if(list != null)
-            {
+            if (list != null) {
                 getProgressMonitor().worked(1);
                 cachePluginList(site, list);
@@ -416 +415 @@
             downloadPluginIcons(site+"-icons.zip", createSiteCacheFile(pluginDir, site, CacheType.ICON_LIST), getProgressMonitor().createSubTaskMonitor(0, false));
         }
-        for (File file: siteCacheFiles) /* remove old stuff or whole update process is broken */
-        {
+        // remove old stuff or whole update process is broken
+        for (File file: siteCacheFiles) {
             file.delete();
         }