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

Timestamp:

2016-01-09T16:37:20+01:00 (10 years ago)

Author:

simon04

Message:

Refactoring: introduce OsmApi#getServerUrl

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• CachedFile.java (modified) (1 diff)
• OsmApi.java (modified) (1 diff)
• OsmConnection.java (modified) (1 diff)
• OsmServerReader.java (modified) (1 diff)

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

@@ -453 +453 @@
     private static void checkOfflineAccess(String urlString) {
         OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlString, Main.getJOSMWebsite());
-        OnlineResource.OSM_API.checkOfflineAccess(urlString, Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
+        OnlineResource.OSM_API.checkOfflineAccess(urlString, OsmApi.getOsmApi().getServerUrl());
     }
 

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

@@ -340 +340 @@
 
     /**
+     * Returns the server URL
+     * @return the server URL
+     * @since 9353
+     */
+    public String getServerUrl() {
+        return serverUrl;
+    }
+
+    /**
      * Creates an OSM primitive on the server. The OsmPrimitive object passed in
      * is modified by giving it the server-assigned id.

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

@@ -127 +127 @@
     protected void obtainAccessToken(final HttpClient connection) throws MissingOAuthAccessTokenException {
         try {
-            final URL apiUrl = new URL(Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
+            final URL apiUrl = new URL(OsmApi.getOsmApi().getServerUrl());
             if (!Objects.equals(apiUrl.getHost(), connection.getURL().getHost())) {
                 throw new MissingOAuthAccessTokenException();

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

@@ -113 +113 @@
         try {
             OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlStr, Main.getJOSMWebsite());
-            OnlineResource.OSM_API.checkOfflineAccess(urlStr, Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
+            OnlineResource.OSM_API.checkOfflineAccess(urlStr, OsmApi.getOsmApi().getServerUrl());
 
             URL url = null;