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

Timestamp:

2018-08-11T16:10:32+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods returning an URL

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• AbstractReader.java (modified) (2 diffs)
• CachedFile.java (modified) (1 diff)
• OsmApi.java (modified) (3 diffs)
• OsmServerReader.java (modified) (3 diffs)
• remotecontrol/handler/ImportHandler.java (modified) (2 diffs)

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

@@ -62 +62 @@
      * @param pp postprocessor
      * @see #deregisterPostprocessor
-     * @since xxx (moved from OsmReader)
+     * @since 14119 (moved from OsmReader)
      */
     public static void registerPostprocessor(OsmServerReadPostprocessor pp) {
@@ -75 +75 @@
      * @param pp postprocessor
      * @see #registerPostprocessor
-     * @since xxx (moved from OsmReader)
+     * @since 14119 (moved from OsmReader)
      */
     public static void deregisterPostprocessor(OsmServerReadPostprocessor pp) {

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

@@ -541 +541 @@
 
     private static void checkOfflineAccess(String urlString) {
-        OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlString, Main.getJOSMWebsite());
+        OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlString, Config.getUrls().getJOSMWebsite());
         OnlineResource.OSM_API.checkOfflineAccess(urlString, OsmApi.getOsmApi().getServerUrl());
     }

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

@@ -37 +37 @@
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.IUrls;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -73 +74 @@
     /**
      * Default URL of the standard OSM API.
+     * @deprecated Use {@link IUrls#getDefaultOsmApiUrl}
      * @since 5422
      */
+    @Deprecated
     public static final String DEFAULT_API_URL = "https://api.openstreetmap.org/api";
 
@@ -136 +139 @@
 
     private static String getServerUrlFromPref() {
-        return Config.getPref().get("osm-server.url", DEFAULT_API_URL);
+        return Config.getPref().get("osm-server.url", Config.getUrls().getDefaultOsmApiUrl());
     }
 

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

@@ -14 +14 @@
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.notes.Note;
@@ -21 +20 @@
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
@@ -155 +155 @@
             boolean uncompressAccordingToContentDisposition, String httpMethod, byte[] requestBody) throws OsmTransferException {
         try {
-            OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlStr, Main.getJOSMWebsite());
+            OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlStr, Config.getUrls().getJOSMWebsite());
             OnlineResource.OSM_API.checkOfflineAccess(urlStr, OsmApi.getOsmApi().getServerUrl());
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -10 +10 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
@@ -75 +74 @@
     public String[] getUsageExamples() {
         return new String[] {"/import?url=" + Utils.encodeUrl(
-                Main.getJOSMWebsite()+"/browser/josm/trunk/data_nodist/direction-arrows.osm?format=txt")};
+                Config.getUrls().getJOSMWebsite()+"/browser/josm/trunk/data_nodist/direction-arrows.osm?format=txt")};
     }