Changeset 12928 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2017-10-06T15:17:51+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - do not copy the entire preferences list, just to set a custom server API in OAuth wizard

Location:

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

Files:

• AuthenticationPreferencesPanel.java (modified) (2 diffs)
• OAuthAuthenticationPreferencesPanel.java (modified) (3 diffs)

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

@@ -134 +134 @@
 
     /**
-     * Saves the current values to preferences
+     * Saves the current values to the preferences
      */
     public final void saveToPreferences() {
@@ -149 +149 @@
             pnlBasicAuthPreferences.saveToPreferences();
             OAuthAccessTokenHolder.getInstance().clear();
-            OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
+            OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
         } else if ("oauth".equals(authMethod)) {
             // clear the password in the preferences

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

@@ -96 +96 @@
         gc.weighty = 1.0;
         pnl.add(pnlAdvancedProperties, gc);
-        pnlAdvancedProperties.initFromPreferences(Main.pref);
+        pnlAdvancedProperties.initialize(OsmApi.getOsmApi().getServerUrl());
         pnlAdvancedProperties.setBorder(
                 BorderFactory.createCompoundBorder(
@@ -162 +162 @@
     public void saveToPreferences() {
         OAuthAccessTokenHolder.getInstance().setSaveToPreferences(cbSaveToPreferences.isSelected());
-        OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
-        pnlAdvancedProperties.rememberPreferences(Main.pref);
+        OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
+        pnlAdvancedProperties.rememberPreferences();
     }
 
@@ -359 +359 @@
         public void actionPerformed(ActionEvent evt) {
             OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
-            OAuthParameters parameters = OAuthParameters.createFromPreferences(Main.pref);
+            OAuthParameters parameters = OAuthParameters.createFromApiUrl(OsmApi.getOsmApi().getServerUrl());
             TestAccessTokenTask task = new TestAccessTokenTask(
                     OAuthAuthenticationPreferencesPanel.this,