Changeset 5412 in josm for trunk/src/org

Timestamp:

2012-08-09T22:27:54+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7943 - fix NPE when switching back to default OSM API server after having tried to upload data to another server instance

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• gui/io/UploadDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -123 +123 @@
         @Override
         public String toString() {
-            return value.toString();
+            return value != null ? value.toString() : "null";
         }
     }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -23 +23 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import javax.swing.InputMap;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -36 +35 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.Preferences.Setting;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -500 +500 @@
         if (e.getKey() == null || ! e.getKey().equals("osm-server.url"))
             return;
-        if (e.getNewValue() == null) {
-            setTitle(tr("Upload"));
+        final Setting<?> newValue = e.getNewValue();
+        final String url;
+        if (newValue == null || newValue.getValue() == null) {
+            url = OsmApi.getOsmApi().getBaseUrl();
         } else {
-            setTitle(tr("Upload to ''{0}''", e.getNewValue()));
-        }
+            url = newValue.getValue().toString();
+        }
+        setTitle(tr("Upload to ''{0}''", url));
     }
 }