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

Timestamp:

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

Author:

simon04

Message:

Refactoring: introduce OsmApi#getServerUrl

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/server

Files:

• OAuthAuthenticationPreferencesPanel.java (modified) (1 diff)
• OsmApiUrlInputPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

@@ -162 +162 @@
      */
     public void initFromPreferences() {
-        setApiUrl(Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL).trim());
+        setApiUrl(OsmApi.getOsmApi().getServerUrl().trim());
         refreshView();
     }

trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java

@@ -119 +119 @@
      */
     public void initFromPreferences() {
-        String url =  Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
+        String url =  OsmApi.getOsmApi().getServerUrl();
         if (OsmApi.DEFAULT_API_URL.equals(url.trim())) {
             cbUseDefaultServerUrl.setSelected(true);
@@ -134 +134 @@
      */
     public void saveToPreferences() {
-        String oldUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
+        String oldUrl = OsmApi.getOsmApi().getServerUrl();
         String hmiUrl = getStrippedApiUrl();
         if (cbUseDefaultServerUrl.isSelected()) {
@@ -143 +143 @@
             Main.pref.put("osm-server.url", hmiUrl);
         }
-        String newUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
+        String newUrl = OsmApi.getOsmApi().getServerUrl();
 
         // When API URL changes, re-initialize API connection so we may adjust