Changeset 2135 in josm for trunk/src/org

Timestamp:

2009-09-14T21:24:54+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3488: "No open changeset" appears in changeset list every second time the list is refreshed
fixed NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/ExtendedDialog.java (modified) (1 diff)
• gui/io/DownloadOpenChangesetsTask.java (modified) (1 diff)
• gui/io/UploadDialog.java (modified) (3 diffs)
• io/OsmApi.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -4 +4 @@
 
 import java.awt.Component;
-import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.Frame;
 import java.awt.GridBagLayout;
 import java.awt.Toolkit;

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

@@ -24 +24 @@
  * This is a task for downloading the open changesets of the current user
  * from the OSM server.
-
  *
  */

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

@@ -864 +864 @@
         }
 
+        /**
+         * Refreshes the list of open changesets
+         * 
+         */
         class RefreshAction extends AbstractAction {
             public RefreshAction() {
@@ -941 +945 @@
         }
 
+        /**
+         * Updates the current list of open changesets with the changesets
+         * in <code>changesets</code>
+         * 
+         * @param changesets the collection of changesets. If null, removes
+         * all changesets from the current list of changesets
+         */
         public void addOrUpdate(Collection<Changeset> changesets) {
+            if (changesets == null){
+                this.changesets.clear();
+                setSelectedItem(null);
+            }
             for (Changeset cs: changesets) {
                 internalAddOrUpdate(cs);
@@ -948 +963 @@
             if (getSelectedItem() == null && !this.changesets.isEmpty()) {
                 setSelectedItem(this.changesets.get(0));
+            } else if (getSelectedItem() != null) {
+                if (changesets.contains(getSelectedItem())) {
+                    setSelectedItem(getSelectedItem());
+                } else {
+                    setSelectedItem(this.changesets.get(0));
+                }
             } else {
                 setSelectedItem(null);

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -355 +355 @@
             sendRequest(
                     "PUT",
-                    "changeset/" + this.changeset.getId(),
-                    toXml(this.changeset),
+                    "changeset/" + changeset.getId(),
+                    toXml(changeset),
                     monitor
             );