Changeset 7434 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/plugin

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/gui/preferences/plugin/PluginPreference.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -50 +50 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.io.OfflineAccessException;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -114 +116 @@
         return sb.toString();
     }
-    
+
     /**
      * Notifies user about result of a finished plugin download task.
@@ -313 +315 @@
     }
 
+    private static Collection<String> getOnlinePluginSites() {
+        Collection<String> pluginSites = new ArrayList<>(Main.pref.getPluginSites());
+        for (Iterator<String> it = pluginSites.iterator(); it.hasNext();) {
+            try {
+                OnlineResource.JOSM_WEBSITE.checkOfflineAccess(it.next(), Main.getJOSMWebsite());
+            } catch (OfflineAccessException ex) {
+                Main.warn(ex.getMessage());
+                it.remove();
+            }
+        }
+        return pluginSites;
+    }
+
     /**
      * The action for downloading the list of available plugins
-     *
      */
     class DownloadAvailablePluginsAction extends AbstractAction {
@@ -327 +341 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            final ReadRemotePluginInformationTask task = new ReadRemotePluginInformationTask(Main.pref.getPluginSites());
+            Collection<String> pluginSites = getOnlinePluginSites();
+            if (pluginSites.isEmpty()) {
+                return;
+            }
+            final ReadRemotePluginInformationTask task = new ReadRemotePluginInformationTask(pluginSites);
             Runnable continuation = new Runnable() {
                 @Override
@@ -345 +363 @@
             Main.worker.submit(continuation);
         }
-    }
-
-    /**
-     * The action for downloading the list of available plugins
-     *
+
+    }
+
+    /**
+     * The action for updating the list of selected plugins
      */
     class UpdateSelectedPluginsAction extends AbstractAction {
@@ -387 +405 @@
                     );
             // the async task for downloading plugin information
-            final ReadRemotePluginInformationTask pluginInfoDownloadTask = new ReadRemotePluginInformationTask(Main.pref.getPluginSites());
+            final ReadRemotePluginInformationTask pluginInfoDownloadTask = new ReadRemotePluginInformationTask(getOnlinePluginSites());
 
             // to be run asynchronously after the plugin download