Changeset 14121 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2018-08-11T17:51:12+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods related to network features. New NetworkManager class

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MessageNotifier.java (modified) (2 diffs)
• NetworkManager.java (added)
• OnlineResource.java (modified) (2 diffs)
• OsmApi.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import java.util.concurrent.TimeUnit;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.data.osm.UserInfo;
@@ -100 +99 @@
     public static void start() {
         int interval = PROP_INTERVAL.get();
-        if (Main.isOffline(OnlineResource.OSM_API)) {
+        if (NetworkManager.isOffline(OnlineResource.OSM_API)) {
             Logging.info(tr("{0} not available (offline mode)", tr("Message notifier")));
         } else if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.Main;
 
 /**
@@ -43 +41 @@
      */
     public final void checkOfflineAccess(String downloadString, String resourceString) {
-        if (Main.isOffline(this) && downloadString.substring(downloadString.indexOf("://"))
+        if (NetworkManager.isOffline(this) && downloadString.substring(downloadString.indexOf("://"))
                 .startsWith(resourceString.substring(resourceString.indexOf("://")))) {
             throw new OfflineAccessException(tr("Unable to access ''{0}'': {1} not available (offline mode)", downloadString, getLocName()));

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

@@ -25 +25 @@
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.notes.Note;
@@ -259 +258 @@
             }
             if (capabilities == null) {
-                if (Main.isOffline(OnlineResource.OSM_API)) {
+                if (NetworkManager.isOffline(OnlineResource.OSM_API)) {
                     Logging.warn(tr("{0} not available (offline mode)", tr("OSM API")));
                 } else {
@@ -280 +279 @@
         } catch (OsmTransferException e) {
             initialized = false;
-            Main.addNetworkError(url, Utils.getRootCause(e));
+            NetworkManager.addNetworkError(url, Utils.getRootCause(e));
             throw new OsmApiInitializationException(e);
         } catch (SAXException | IOException | ParserConfigurationException e) {