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

Timestamp:

2014-08-20T03:07:15+02:00 (12 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/GettingStarted.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
 import org.openstreetmap.josm.io.CacheCustomContent;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -95 +96 @@
         }
 
+        @Override
+        protected void checkOfflineAccess() {
+            OnlineResource.JOSM_WEBSITE.checkOfflineAccess(new WikiReader().getBaseUrlWiki(), Main.getJOSMWebsite());
+        }
+
         /**
          * Additionally check if JOSM has been updated and refresh MOTD
@@ -151 +157 @@
                 }
 
-                EventQueue.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        lg.setText(fixImageLinks(content));
-                    }
-                });
+                if (content != null) {
+                    EventQueue.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            lg.setText(fixImageLinks(content));
+                        }
+                    });
+                }
             }
         }, "MOTD-Loader");