Changeset 6847 in josm for trunk/src/org

Timestamp:

2014-02-12T20:52:31+01:00 (11 years ago)

Author:

Don-vip

Message:

see #9710 - OAuth advanced parameters persistence

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/oauth/OAuthParameters.java (modified) (1 diff)
• gui/oauth/AdvancedOAuthPropertiesPanel.java (modified) (1 diff)
• gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) (1 diff)

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

@@ -235 +235 @@
     }
 
-    /**
-     * Saves these OAuth parameters to the given {@code Preferences}.
-     * @param pref The Preferences into which are saved these OAuth parameters with the prefix "oauth.settings"
-     */
-    public void saveToPreferences(Preferences pref) {
-        pref.put("oauth.settings.consumer-key", consumerKey);
-        pref.put("oauth.settings.consumer-secret", consumerSecret);
-        pref.put("oauth.settings.request-token-url", requestTokenUrl);
-        pref.put("oauth.settings.access-token-url", accessTokenUrl);
-        pref.put("oauth.settings.authorise-url", authoriseUrl);
-    }
-
     @Override
     public int hashCode() {

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

@@ -246 +246 @@
         } else {
             cbUseDefaults.setSelected(false);
-            tfConsumerKey.setText(pref.get("oauth.settings.consumer-key", ""));
-            tfConsumerSecret.setText(pref.get("oauth.settings.consumer-secret", ""));
-            tfRequestTokenURL.setText(pref.get("oauth.settings.request-token-url", ""));
-            tfAccessTokenURL.setText(pref.get("oauth.settings.access-token-url", ""));
-            tfAuthoriseURL.setText(pref.get("oauth.settings.authorise-url", ""));
+            tfConsumerKey.setText(pref.get("oauth.settings.consumer-key", OAuthParameters.DEFAULT_JOSM_CONSUMER_KEY));
+            tfConsumerSecret.setText(pref.get("oauth.settings.consumer-secret", OAuthParameters.DEFAULT_JOSM_CONSUMER_SECRET));
+            tfRequestTokenURL.setText(pref.get("oauth.settings.request-token-url", OAuthParameters.DEFAULT_REQUEST_TOKEN_URL));
+            tfAccessTokenURL.setText(pref.get("oauth.settings.access-token-url", OAuthParameters.DEFAULT_ACCESS_TOKEN_URL));
+            tfAuthoriseURL.setText(pref.get("oauth.settings.authorise-url", OAuthParameters.DEFAULT_AUTHORISE_URL));
             setChildComponentsEnabled(true);
         }

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

@@ -171 +171 @@
         OAuthAccessTokenHolder.getInstance().setSaveToPreferences(cbSaveToPreferences.isSelected());
         OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
-        pnlAdvancedProperties.getAdvancedParameters().saveToPreferences(Main.pref);
+        pnlAdvancedProperties.rememberPreferences(Main.pref);
     }