Changeset 14119 in josm for trunk/src/org/openstreetmap/josm/data/oauth

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods returning an URL

File:

• trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -4 +4 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -56 +55 @@
         }
 
-        if (apiUrl != null && !OsmApi.DEFAULT_API_URL.equals(apiUrl)) {
+        if (apiUrl != null && !Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl)) {
             consumerKey = ""; // a custom consumer key is required
             consumerSecret = ""; // a custom consumer secret is requireds
@@ -63 +62 @@
             consumerKey = DEFAULT_JOSM_CONSUMER_KEY;
             consumerSecret = DEFAULT_JOSM_CONSUMER_SECRET;
-            serverUrl = Main.getOSMWebsite();
+            serverUrl = Config.getUrls().getOSMWebsite();
         }