Changeset 6599 in josm for trunk

Timestamp:

2014-01-02T23:27:34+01:00 (11 years ago)

Author:

bastiK

Message:

fixed #9505 - Defaults for osm-server.url differ = !null

Loosen the conditions for default values. In general default values must be equal for the same key throughout the code. As an exception, you can always provide null as dummy default value (as it was before [6578]).

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• data/oauth/OAuthParameters.java (modified) (1 diff)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1026 +1026 @@
         CheckParameterUtil.ensureParameterNotNull(key);
         CheckParameterUtil.ensureParameterNotNull(def);
-        if (defaultsMap.containsKey(key) && !def.equals(defaultsMap.get(key))) {
+        Setting oldDef = defaultsMap.get(key);
+        if (oldDef != null && oldDef.getValue() != null && def.getValue() != null && !def.equals(oldDef)) {
             Main.info("Defaults for " + key + " differ: " + def + " != " + defaultsMap.get(key));
         }

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

@@ -91 +91 @@
      */
     static public OAuthParameters createFromPreferences(Preferences pref) {
-        OAuthParameters parameters = createDefault(pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
+        OAuthParameters parameters = createDefault(pref.get("osm-server.url"));
         parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", parameters.getConsumerKey()));
         parameters.setConsumerSecret(pref.get("oauth.settings.consumer-secret", parameters.getConsumerSecret()));

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

@@ -35 +35 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -62 +61 @@
      */
     public OsmOAuthAuthorizationClient() {
-        oauthProviderParameters = OAuthParameters.createDefault(Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
+        oauthProviderParameters = OAuthParameters.createDefault(Main.pref.get("osm-server.url"));
         consumer = oauthProviderParameters.buildConsumer();
         provider = oauthProviderParameters.buildProvider(consumer);