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

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/actions

Files:

• CloseChangesetAction.java (modified) (2 diffs)
• DownloadNotesInViewAction.java (modified) (3 diffs)
• DownloadOsmInViewAction.java (modified) (3 diffs)
• HelpAction.java (modified) (2 diffs)
• HistoryInfoAction.java (modified) (2 diffs)
• UpdateDataAction.java (modified) (2 diffs)
• UpdateModifiedAction.java (modified) (2 diffs)
• UpdateSelectionAction.java (modified) (2 diffs)
• relation/AbstractRelationAction.java (modified) (3 diffs)
• upload/ApiPreconditionCheckerHook.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.io.CloseChangesetTask;
 import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
@@ -52 +53 @@
         );
         putValue("help", ht("/Action/CloseChangeset"));
-        setEnabled(!Main.isOffline(OnlineResource.OSM_API));
+        setEnabled(!NetworkManager.isOffline(OnlineResource.OSM_API));
 
     }

trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java

@@ -7 +7 @@
 import java.util.concurrent.Future;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
@@ -13 +12 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 
@@ -55 +55 @@
     protected void updateEnabledState() {
         setEnabled(getLayerManager().getActiveLayer() != null
-                && !Main.isOffline(OnlineResource.OSM_API));
+                && !NetworkManager.isOffline(OnlineResource.OSM_API));
     }
 }

trunk/src/org/openstreetmap/josm/actions/DownloadOsmInViewAction.java

@@ -7 +7 @@
 import java.util.concurrent.Future;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
@@ -14 +13 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 
@@ -43 +43 @@
     protected void updateEnabledState() {
         setEnabled(getLayerManager().getActiveLayer() != null
-                && !Main.isOffline(OnlineResource.OSM_API));
+                && !NetworkManager.isOffline(OnlineResource.OSM_API));
     }
 

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -35 +36 @@
                 shortcut ? Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT) : null,
                 true);
-        setEnabled(!Main.isOffline(OnlineResource.JOSM_WEBSITE));
+        setEnabled(!NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE));
     }
 

trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.dialogs.OsmIdSelectionDialog;
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -67 +68 @@
         public void setupDialog() {
             super.setupDialog();
-            buttons.get(0).setEnabled(!Main.isOffline(OnlineResource.OSM_API));
+            buttons.get(0).setEnabled(!NetworkManager.isOffline(OnlineResource.OSM_API));
         }
     }

trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -12 +12 @@
 import java.util.concurrent.Future;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTaskList;
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -48 +48 @@
     protected void updateEnabledState() {
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        setEnabled(editLayer != null && editLayer.isDownloadable() && !Main.isOffline(OnlineResource.OSM_API));
+        setEnabled(editLayer != null && editLayer.isDownloadable() && !NetworkManager.isOffline(OnlineResource.OSM_API));
     }
 

trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java

@@ -9 +9 @@
 import java.util.Collections;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -49 +49 @@
         DataSet ds = getLayerManager().getEditDataSet();
         setEnabled(ds != null && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy())
-                && !Main.isOffline(OnlineResource.OSM_API));
+                && !NetworkManager.isOffline(OnlineResource.OSM_API));
     }
 

trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -125 +126 @@
             DataSet ds = selection.iterator().next().getDataSet();
             setEnabled(!ds.isLocked() && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy())
-                    && !Main.isOffline(OnlineResource.OSM_API));
+                    && !NetworkManager.isOffline(OnlineResource.OSM_API));
         }
     }

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -7 +7 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.IPrimitiveAction;
 import org.openstreetmap.josm.data.osm.DownloadPolicy;
@@ -13 +12 @@
 import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.OsmData;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -57 +57 @@
         }
         OsmData<?, ?, ?, ?> ds = relations.iterator().next().getDataSet();
-        return !Main.isOffline(OnlineResource.OSM_API)
+        return !NetworkManager.isOffline(OnlineResource.OSM_API)
             && ds != null && !ds.isLocked() && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy());
     }

trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.io.OsmApi;
@@ -33 +34 @@
         OsmApi api = OsmApi.getOsmApi();
         try {
-            if (Main.isOffline(OnlineResource.OSM_API)) {
+            if (NetworkManager.isOffline(OnlineResource.OSM_API)) {
                 return false;
             }