Changeset 5422 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

Timestamp:

2012-08-11T17:37:00+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7943 - Introduce OsmApi.DEFAULT_API_URL, better handling of change of API URL in OAuth management, javadoc improvements

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (modified) (10 diffs)

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

@@ -27 +27 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * Panel allowing the user to setup advanced OAuth parameters:
+ * <li>Consumer key</li>
+ * <li>Consumer secret</li>
+ * <li>Request token URL</li>
+ * <li>Access token URL</li>
+ * <li>Authorize URL</li>
+ * 
+ * @see OAuthParameters
+ * @since 2746
+ */
 public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
 
@@ -36 +47 @@
     private JTextField tfAuthoriseURL;
     private UseDefaultItemListener ilUseDefault;
+    private String apiUrl;
 
     protected void build() {
@@ -110 +122 @@
 
     protected boolean hasCustomSettings() {
+        OAuthParameters params = OAuthParameters.createDefault(apiUrl);
         return
-        ! tfConsumerKey.getText().equals( OAuthParameters.DEFAULT_JOSM_CONSUMER_KEY)
-        || ! tfConsumerSecret.getText().equals( OAuthParameters.DEFAULT_JOSM_CONSUMER_SECRET)
-        || ! tfRequestTokenURL.getText().equals( OAuthParameters.DEFAULT_REQUEST_TOKEN_URL)
-        || ! tfAccessTokenURL.getText().equals( OAuthParameters.DEFAULT_ACCESS_TOKEN_URL)
-        || ! tfAuthoriseURL.getText().equals( OAuthParameters.DEFAULT_AUTHORISE_URL);
+           ! tfConsumerKey.getText().equals(params.getConsumerKey())
+        || ! tfConsumerSecret.getText().equals(params.getConsumerSecret())
+        || ! tfRequestTokenURL.getText().equals(params.getRequestTokenUrl())
+        || ! tfAccessTokenURL.getText().equals(params.getAccessTokenUrl())
+        || ! tfAuthoriseURL.getText().equals(params.getAuthoriseUrl());
     }
 
@@ -152 +165 @@
     protected void resetToDefaultSettings() {
         cbUseDefaults.setSelected(true);
-        tfConsumerKey.setText( OAuthParameters.DEFAULT_JOSM_CONSUMER_KEY);
-        tfConsumerSecret.setText( OAuthParameters.DEFAULT_JOSM_CONSUMER_SECRET);
-        tfRequestTokenURL.setText(OAuthParameters.DEFAULT_REQUEST_TOKEN_URL);
-        tfAccessTokenURL.setText(OAuthParameters.DEFAULT_ACCESS_TOKEN_URL);
-        tfAuthoriseURL.setText(OAuthParameters.DEFAULT_AUTHORISE_URL);
+        OAuthParameters params = OAuthParameters.createDefault(apiUrl);
+        tfConsumerKey.setText(params.getConsumerKey());
+        tfConsumerSecret.setText(params.getConsumerSecret());
+        tfRequestTokenURL.setText(params.getRequestTokenUrl());
+        tfAccessTokenURL.setText(params.getAccessTokenUrl());
+        tfAuthoriseURL.setText(params.getAuthoriseUrl());
 
         setChildComponentsEnabled(false);
@@ -176 +190 @@
     public OAuthParameters getAdvancedParameters() {
         if (cbUseDefaults.isSelected())
-            return OAuthParameters.createDefault();
+            return OAuthParameters.createDefault(apiUrl);
         OAuthParameters parameters = new OAuthParameters();
         parameters.setConsumerKey(tfConsumerKey.getText());
@@ -194 +208 @@
     public void setAdvancedParameters(OAuthParameters parameters) throws IllegalArgumentException{
         CheckParameterUtil.ensureParameterNotNull(parameters, "parameters");
-        if (parameters.equals(OAuthParameters.createDefault())) {
+        if (parameters.equals(OAuthParameters.createDefault(apiUrl))) {
             cbUseDefaults.setSelected(true);
             setChildComponentsEnabled(false);
@@ -208 +222 @@
     }
 
+    /**
+     * Constructs a new {@code AdvancedOAuthPropertiesPanel}.
+     */
     public AdvancedOAuthPropertiesPanel() {
         build();
@@ -218 +235 @@
      * @throws IllegalArgumentException thrown if pref is null
      */
-    public void initFromPreferences(Preferences pref) throws IllegalArgumentException{
+    public void initFromPreferences(Preferences pref) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(pref, "pref");
+        setApiUrl(pref.get("osm-server-url"));
         boolean useDefault = pref.getBoolean("oauth.settings.use-default", true);
         ilUseDefault.setEnabled(false);
@@ -265 +283 @@
         public void itemStateChanged(ItemEvent e) {
             if (!enabled) return;
-            switch(e.getStateChange()) {
+            switch (e.getStateChange()) {
             case ItemEvent.SELECTED:
                 if (hasCustomSettings()) {
@@ -285 +303 @@
         }
     }
+
+    /**
+     * Sets the URL of the OSM API for which this panel is currently displaying OAuth properties.
+     *
+     * @param apiUrl the api URL
+     * @since 5422
+     */
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+        if (cbUseDefaults.isSelected()) {
+            resetToDefaultSettings();
+        }
+    }
 }