Changeset 6845 in josm for trunk

Timestamp:

2014-02-12T18:37:27+01:00 (11 years ago)

Author:

stoecker

Message:

don't have two osm-server url settings

Location:

trunk/src/org/openstreetmap/josm/gui/oauth

Files:

• AdvancedOAuthPropertiesPanel.java (modified) (1 diff)
• OAuthAuthorizationWizard.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

@@ -239 +239 @@
     public void initFromPreferences(Preferences pref) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(pref, "pref");
-        setApiUrl(pref.get("osm-server-url"));
+        setApiUrl(pref.get("osm-server.url"));
         boolean useDefault = pref.getBoolean("oauth.settings.use-default", true);
         ilUseDefault.setEnabled(false);

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -280 +280 @@
         // Copy current JOSM preferences to update API url with the one used in this wizard
         Preferences copyPref = CustomConfigurator.clonePreferences(Main.pref);
-        copyPref.put("osm-server-url", apiUrl);
+        copyPref.put("osm-server.url", apiUrl);
         pnlFullyAutomaticAuthorisationUI.initFromPreferences(copyPref);
         pnlSemiAutomaticAuthorisationUI.initFromPreferences(copyPref);