Changeset 16427 in josm for trunk/src/org

Timestamp:

2020-05-16T21:25:54+02:00 (4 years ago)

Author:

simon04

Message:

see #18712 - Add OfflineAccessException.forResource(String)

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/MessageNotifier.java (modified) (1 diff)
• io/OfflineAccessException.java (modified) (2 diffs)
• io/OnlineResource.java (modified) (1 diff)
• io/OsmApi.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (2 diffs)

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

@@ -105 +105 @@
         int interval = PROP_INTERVAL.get();
         if (NetworkManager.isOffline(OnlineResource.OSM_API)) {
-            Logging.info(tr("{0} not available (offline mode)", tr("Message notifier")));
+            Logging.info(OfflineAccessException.forResource(tr("Message notifier")).getMessage());
         } else if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {
             task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval, TimeUnit.MINUTES);

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -15 +17 @@
         super(s);
     }
+
+    /**
+     * Returns a new OfflineAccessException with a translated message for the given resource
+     * @param name the translated name/description of the resource
+     * @return a new OfflineAccessException
+     */
+    public static OfflineAccessException forResource(String name) {
+        return new OfflineAccessException(tr("{0} not available (offline mode)", name));
+    }
 }

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

@@ -69 +69 @@
     public final void checkOfflineAccess(String downloadString, String ignore) {
         if (NetworkManager.isOffline(downloadString)) {
-            throw new OfflineAccessException(tr("Unable to access ''{0}'': {1} not available (offline mode)", downloadString, getLocName()));
+            throw OfflineAccessException.forResource(downloadString);
         }
     }

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

@@ -256 +256 @@
             if (capabilities == null) {
                 if (NetworkManager.isOffline(OnlineResource.OSM_API)) {
-                    Logging.warn(tr("{0} not available (offline mode)", tr("OSM API")));
+                    Logging.warn(OfflineAccessException.forResource(tr("")).getMessage());
                 } else {
                     Logging.error(tr("Unable to initialize OSM API."));

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

@@ -158 +158 @@
         try {
             if (NetworkManager.isOffline(urlStr)) {
-                throw new OsmApiException(new OfflineAccessException(tr("{0} not available (offline mode)", urlStr)));
+                throw new OsmApiException(OfflineAccessException.forResource(urlStr));
             }
 

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

@@ -67 +67 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.io.NetworkManager;
+import org.openstreetmap.josm.io.OfflineAccessException;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Destroyable;
@@ -435 +436 @@
     public static boolean checkAndConfirmPluginUpdate(Component parent) {
         if (Preferences.main().getPluginSites().stream().anyMatch(NetworkManager::isOffline)) {
-            Logging.info(tr("{0} not available (offline mode)", tr("Plugin update")));
+            Logging.info(OfflineAccessException.forResource(tr("Plugin update")).getMessage());
             return false;
         }