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

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/oauth

Files:

• AbstractAuthorizationUI.java (modified) (1 diff)
• AdvancedOAuthPropertiesPanel.java (modified) (3 diffs)
• FullyAutomaticAuthorizationUI.java (modified) (1 diff)
• OAuthAuthorizationWizard.java (modified) (2 diffs)

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

@@ -130 +130 @@
 
     /**
+     * Initializes the authorisation UI.
+     *
+     * @param paramApiUrl the API URL. Must not be null.
+     * @throws IllegalArgumentException if paramApiUrl is null
+     */
+    public void initialize(String paramApiUrl) {
+        CheckParameterUtil.ensureParameterNotNull(paramApiUrl, "paramApiUrl");
+        pnlAdvancedProperties.initialize(paramApiUrl);
+    }
+
+    /**
      * Initializes the authorisation UI with preference values in <code>pref</code>.
      *
      * @param pref the preferences. Must not be null.
      * @throws IllegalArgumentException if pref is null
+     * @deprecated (since 12928) replaced by {@link #initialize(java.lang.String)}
      */
+    @Deprecated
     public void initFromPreferences(Preferences pref) {
         CheckParameterUtil.ensureParameterNotNull(pref, "pref");

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

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -257 +258 @@
      * Initializes the panel from the values in the preferences <code>preferences</code>.
      *
+     * @param paramApiUrl the API URL. Must not be null.
+     * @throws IllegalArgumentException if paramApiUrl is null
+     */
+    public void initialize(String paramApiUrl) {
+        CheckParameterUtil.ensureParameterNotNull(paramApiUrl, "paramApiUrl");
+        setApiUrl(paramApiUrl);
+        boolean useDefault = Config.getPref().getBoolean("oauth.settings.use-default", true);
+        ilUseDefault.setEnabled(false);
+        if (useDefault) {
+            resetToDefaultSettings();
+        } else {
+            setAdvancedParameters(OAuthParameters.createFromApiUrl(paramApiUrl));
+        }
+        ilUseDefault.setEnabled(true);
+    }
+
+    /**
+     * Initializes the panel from the values in the preferences <code>preferences</code>.
+     *
      * @param pref the preferences. Must not be null.
      * @throws IllegalArgumentException if pref is null
-     */
+     * @deprecated (since 12928) replaced by {@link #initialize(java.lang.String)}
+     */
+    @Deprecated
     public void initFromPreferences(Preferences pref) {
         CheckParameterUtil.ensureParameterNotNull(pref, "pref");
@@ -275 +297 @@
     /**
      * Remembers the current values in the preferences <code>pref</code>.
+     */
+    public void rememberPreferences() {
+        Config.getPref().putBoolean("oauth.settings.use-default", cbUseDefaults.isSelected());
+        if (cbUseDefaults.isSelected()) {
+            new OAuthParameters(null, null, null, null, null, null, null).rememberPreferences();
+        } else {
+            getAdvancedParameters().rememberPreferences();
+        }
+    }
+
+    /**
+     * Remembers the current values in the preferences <code>pref</code>.
      *
      * @param pref the preferences. Must not be null.
      * @throws IllegalArgumentException if pref is null.
-     */
+     * @deprecated (since 12928) replaced by {@link #rememberPreferences()}
+     */
+    @Deprecated
     public void rememberPreferences(Preferences pref) {
         CheckParameterUtil.ensureParameterNotNull(pref, "pref");

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

@@ -169 +169 @@
     /**
      * Initializes the panel with values from the preferences
+     * @param paramApiUrl the API URL
+     */
+    @Override
+    public void initialize(String paramApiUrl) {
+        super.initialize(paramApiUrl);
+        CredentialsAgent cm = CredentialsManager.getInstance();
+        try {
+            PasswordAuthentication pa = cm.lookup(RequestorType.SERVER, OsmApi.getOsmApi().getHost());
+            if (pa == null) {
+                tfUserName.setText("");
+                tfPassword.setText("");
+            } else {
+                tfUserName.setText(pa.getUserName() == null ? "" : pa.getUserName());
+                tfPassword.setText(pa.getPassword() == null ? "" : String.valueOf(pa.getPassword()));
+            }
+        } catch (CredentialsAgentException e) {
+            Logging.error(e);
+            tfUserName.setText("");
+            tfPassword.setText("");
+        }
+    }
+
+    /**
+     * Initializes the panel with values from the preferences
      * @param pref Preferences structure
-     */
+     * @deprecated (since 12928) replaced by {@link #initialize(java.lang.String)}
+     */
+    @Deprecated
     @Override
     public void initFromPreferences(Preferences pref) {

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

@@ -40 +40 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
@@ -309 +308 @@
      */
     public void initFromPreferences() {
-        // Copy current JOSM preferences to update API url with the one used in this wizard
-        Preferences copyPref = new Preferences(Main.pref);
-        copyPref.put("osm-server.url", apiUrl);
-        pnlFullyAutomaticAuthorisationUI.initFromPreferences(copyPref);
-        pnlSemiAutomaticAuthorisationUI.initFromPreferences(copyPref);
-        pnlManualAuthorisationUI.initFromPreferences(copyPref);
+        pnlFullyAutomaticAuthorisationUI.initialize(apiUrl);
+        pnlSemiAutomaticAuthorisationUI.initialize(apiUrl);
+        pnlManualAuthorisationUI.initialize(apiUrl);
     }