Changeset 6602 in josm for trunk/src

Timestamp:

2014-01-03T02:17:12+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9511 - non propagation of OSM API url to OAuth preferences panel (regression from r6523)

Location:

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

Files:

• OAuthAuthenticationPreferencesPanel.java (modified) (2 diffs)
• OsmApiUrlInputPanel.java (modified) (12 diffs)

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

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.gui.oauth.TestAccessTokenTask;
+import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -160 +161 @@
      */
     public void initFromPreferences() {
+        setApiUrl(Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL).trim());
         refreshView();
     }

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

@@ -34 +34 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -52 +53 @@
     /** indicates whether to use the default OSM URL or not */
     private JCheckBox cbUseDefaultServerUrl;
-
-    protected JPanel buildDefultServerUrlPanel() {
+    
+    private ApiUrlPropagator propagator;
+
+    protected JPanel buildDefaultServerUrlPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
@@ -84 +87 @@
         gc.insets = new Insets(0,0,0,0);
         gc.gridwidth  = 4;
-        add(buildDefultServerUrlPanel(), gc);
+        add(buildDefaultServerUrlPanel(), gc);
 
 
@@ -101 +104 @@
         valOsmServerUrl = new ApiUrlValidator(tfOsmServerUrl);
         valOsmServerUrl.validate();
-        ApiUrlPropagator propagator = new ApiUrlPropagator();
+        propagator = new ApiUrlPropagator();
         tfOsmServerUrl.addActionListener(propagator);
         tfOsmServerUrl.addFocusListener(propagator);
@@ -131 +134 @@
         if (url.trim().equals(OsmApi.DEFAULT_API_URL)) {
             cbUseDefaultServerUrl.setSelected(true);
-            firePropertyChange(API_URL_PROP, null, OsmApi.DEFAULT_API_URL);
+            propagator.propagate(OsmApi.DEFAULT_API_URL);
         } else {
             cbUseDefaultServerUrl.setSelected(false);
             tfOsmServerUrl.setText(url);
-            firePropertyChange(API_URL_PROP, null, url);
+            propagator.propagate(url);
         }
     }
@@ -143 +146 @@
      */
     public void saveToPreferences() {
-        String old_url = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
+        String oldUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
+        String hmiUrl = getStrippedApiUrl();
         if (cbUseDefaultServerUrl.isSelected()) {
             Main.pref.put("osm-server.url", null);
-        } else if (tfOsmServerUrl.getText().trim().equals(OsmApi.DEFAULT_API_URL)) {
+        } else if (hmiUrl.equals(OsmApi.DEFAULT_API_URL)) {
             Main.pref.put("osm-server.url", null);
         } else {
-            Main.pref.put("osm-server.url", tfOsmServerUrl.getText().trim());
-        }
-        String new_url = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
+            Main.pref.put("osm-server.url", hmiUrl);
+        }
+        String newUrl = 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.equals(new_url)) {
+        if (!oldUrl.equals(newUrl)) {
             try {
                 OsmApi.getOsmApi().initialize(null);
@@ -163 +167 @@
         }
     }
+    
+    /**
+     * Returns the entered API URL, stripped of leading and trailing white characters.
+     * @return the entered API URL, stripped of leading and trailing white characters. 
+     *         May be an empty string if nothing has been entered. In this case, it means the user wants to use {@link OsmApi#DEFAULT_API_URL}.
+     * @see Utils#strip(String)
+     * @since 6602
+     */
+    public final String getStrippedApiUrl() {
+        return Utils.strip(tfOsmServerUrl.getText());
+    }
 
     class ValidateApiUrlAction extends AbstractAction implements DocumentListener {
@@ -175 +190 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            final String url = tfOsmServerUrl.getText().trim();
+            final String url = getStrippedApiUrl();
             final ApiUrlTestTask task = new ApiUrlTestTask(OsmApiUrlInputPanel.this, url);
             Main.worker.submit(task);
@@ -204 +219 @@
 
         protected void updateEnabledState() {
-            boolean enabled =
-                !tfOsmServerUrl.getText().trim().isEmpty()
-                && !tfOsmServerUrl.getText().trim().equals(lastTestedUrl);
+            String url = getStrippedApiUrl();
+            boolean enabled = !url.isEmpty() && !url.equals(lastTestedUrl);
             if (enabled) {
                 lblValid.setIcon(null);
@@ -281 +295 @@
             case ItemEvent.SELECTED:
                 setApiUrlInputEnabled(false);
-                firePropertyChange(API_URL_PROP, null, OsmApi.DEFAULT_API_URL);
+                propagator.propagate(OsmApi.DEFAULT_API_URL);
                 break;
             case ItemEvent.DESELECTED:
@@ -287 +301 @@
                 valOsmServerUrl.validate();
                 tfOsmServerUrl.requestFocusInWindow();
-                firePropertyChange(API_URL_PROP, null, tfOsmServerUrl.getText());
+                propagator.propagate();
                 break;
             }
@@ -295 +309 @@
     class ApiUrlPropagator extends FocusAdapter implements ActionListener {
         public void propagate() {
-            firePropertyChange(API_URL_PROP, null, tfOsmServerUrl.getText());
+            propagate(getStrippedApiUrl());
+        }
+
+        public void propagate(String url) {
+            firePropertyChange(API_URL_PROP, null, url);
         }