Changeset 6582 in josm for trunk/src/org

Timestamp:

2014-01-01T11:57:38+01:00 (11 years ago)

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/oauth/OAuthParameters.java (modified) (1 diff)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (2 diffs)
• gui/preferences/server/OsmApiUrlInputPanel.java (modified) (3 diffs)
• io/OsmApi.java (modified) (1 diff)
• tools/ExceptionUtil.java (modified) (1 diff)

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"));
+        OAuthParameters parameters = createDefault(pref.get("osm-server.url", OsmApi.DEFAULT_API_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;
@@ -61 +62 @@
      */
     public OsmOAuthAuthorizationClient() {
-        oauthProviderParameters = OAuthParameters.createDefault(Main.pref.get("osm-server.url"));
+        oauthProviderParameters = OAuthParameters.createDefault(Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
         consumer = oauthProviderParameters.buildConsumer();
         provider = oauthProviderParameters.buildProvider(consumer);

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

@@ -128 +128 @@
      */
     public void initFromPreferences() {
-        String url =  Main.pref.get("osm-server.url", null);
-        if (url == null) {
-            cbUseDefaultServerUrl.setSelected(true);
-            firePropertyChange(API_URL_PROP, null, OsmApi.DEFAULT_API_URL);
-        } else if (url.trim().equals(OsmApi.DEFAULT_API_URL)) {
+        String url =  Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
+        if (url.trim().equals(OsmApi.DEFAULT_API_URL)) {
             cbUseDefaultServerUrl.setSelected(true);
             firePropertyChange(API_URL_PROP, null, OsmApi.DEFAULT_API_URL);
@@ -146 +143 @@
      */
     public void saveToPreferences() {
-        String old_url = Main.pref.get("osm-server.url", null);
+        String old_url = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
         if (cbUseDefaultServerUrl.isSelected()) {
             Main.pref.put("osm-server.url", null);
@@ -154 +151 @@
             Main.pref.put("osm-server.url", tfOsmServerUrl.getText().trim());
         }
-        String new_url = Main.pref.get("osm-server.url", null);
+        String new_url = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
 
         // When API URL changes, re-initialize API connection so we may adjust
         // server-dependent settings.
-        if ((old_url == null && new_url != null) || (old_url != null && !old_url.equals(new_url))) {
+        if (!old_url.equals(new_url)) {
             try {
                 OsmApi.getOsmApi().initialize(null);

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

@@ -99 +99 @@
      *
      * @return the OsmApi
-     * @throws IllegalStateException thrown, if the preference <code>osm-server.url</code> is not set
-     *
      */
     static public OsmApi getOsmApi() {
         String serverUrl = Main.pref.get("osm-server.url", DEFAULT_API_URL);
-        if (serverUrl == null)
-            throw new IllegalStateException(tr("Preference ''{0}'' missing. Cannot initialize OsmApi.", "osm-server.url"));
         return getOsmApi(serverUrl);
     }

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -52 +52 @@
         String msg = tr(
                 "<html>Failed to initialize communication with the OSM server {0}.<br>"
-                + "Check the server URL in your preferences and your internet connection.", Main.pref.get(
-                        "osm-server.url", OsmApi.DEFAULT_API_URL));
+                + "Check the server URL in your preferences and your internet connection.",
+                Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL));
         return msg;
     }