Changeset 16430 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-05-16T21:57:03+02:00 (5 years ago)

Author:

simon04

Message:

fix #18162, see #18712 - Add --offline=CACHE_UPDATES to disable updates of CachedFiles

This includes imagery index, custom styles, presets.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (1 diff)
• io/CachedFile.java (modified) (1 diff)
• io/OnlineResource.java (modified) (1 diff)

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

@@ -652 +652 @@
                 "\t--debug                                   "+tr("Print debugging messages to console")+"\n\n"+
                 "\t--skip-plugins                            "+tr("Skip loading plugins")+"\n\n"+
-                "\t--offline=<osm_api|josm_website|certificates|all> "+tr("Disable access to the given resource(s), separated by comma")+"\n\n"+
+                "\t--offline=" + Arrays.stream(OnlineResource.values()).map(OnlineResource::name).collect(
+                        Collectors.joining("|", "<", ">")) + "\n" +
+                "\t                                          "+tr("Disable access to the given resource(s), separated by comma") + "\n" +
+                "\t                                          "+Arrays.stream(OnlineResource.values()).map(OnlineResource::getLocName).collect(
+                        Collectors.joining("|", "<", ">")) + "\n\n" +
                 tr("options provided as Java system properties")+":\n"+
                 align("\t-Djosm.dir.name=JOSM") + tr("Change the JOSM directory name") + "\n\n" +

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -449 +449 @@
                 if (offline || age < maxAgeMillis) {
                     return localFile;
+                } else if (NetworkManager.isOffline(OnlineResource.CACHE_UPDATES)) {
+                    Logging.warn(OfflineAccessException.forResource(tr("Cache update for {0}", urlStr)).getMessage());
+                    return localFile;
                 }
                 if (cachingStrategy == CachingStrategy.IfModifiedSince) {

trunk/src/org/openstreetmap/josm/io/OnlineResource.java

@@ -19 +19 @@
     /** The JOSM website, used for startup page, imagery/presets/styles/rules entries, help, etc. */
     JOSM_WEBSITE(tr("JOSM website")),
+    /** Updates of {@link CachedFile} */
+    CACHE_UPDATES(tr("Cache updates")),
     /** Various government certificates downloaded on Windows to make https imagery work in some countries */
     CERTIFICATES(tr("Certificates")),