Changeset 2115 in josm for trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

Timestamp:

13.09.2009 19:30:36 (3 years ago)

Author:

Gubaer

Message:

new: reading open changesets from the server
new: reading user info from the server
new: any open changeset can be used when uploading
new: generic dialog for closing changesets
fixed #3427: JOSM can't keep many changesets open at once
fixed #3408: Allow continuing opened changeset even after restarting JOSM
fixed #3476: Default selection in upload dialog should be different for unclosed changesets. (Upload dialog now looks different)

File:

• trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (moved) (moved from trunk/src/org/openstreetmap/josm/actions/StopChangesetAction.java) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.io.ChangesetProcessingType;
-import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.gui.io.CloseChangesetDialog;
+import org.openstreetmap.josm.gui.io.CloseChangesetTask;
+import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.io.OsmServerChangesetReader;
+import org.openstreetmap.josm.io.OsmServerUserInfoReader;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
+public class CloseChangesetAction extends JosmAction{
 
-public class StopChangesetAction extends JosmAction{
-
-    public StopChangesetAction() {
-        super(tr("Close current changeset"),
+    public CloseChangesetAction() {
+        super(tr("Close open changesets"),
                 "closechangeset",
-                tr("Close the current changeset ..."),
+                tr("Closes open changesets"),
                 Shortcut.registerShortcut(
                         "system:closechangeset",
-                        tr("File: {0}", tr("Close the current changeset ...")),
+                        tr("File: {0}", tr("Closes open changesets")),
                         KeyEvent.VK_Q,
                         Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2
@@ -36 +44 @@
     }
     public void actionPerformed(ActionEvent e) {
-        if (OsmApi.getOsmApi().getCurrentChangeset() == null) {
+        Main.worker.submit(new DownloadOpenChangesetsTask());
+    }
+
+
+    protected void onPostDownloadOpenChangesets(DownloadOpenChangesetsTask task) {
+        if (task.isCancelled() || task.getLastException() != null) return;
+
+        List<Changeset> openChangesets = task.getChangesets();
+        if (openChangesets.isEmpty()) {
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    tr("There is currently no changeset open."),
-                    tr("No open changeset"),
+                    tr("There are no open changesets"),
+                    tr("No open changesets"),
                     JOptionPane.INFORMATION_MESSAGE
             );
             return;
         }
-        Main.worker.submit(new StopChangesetActionTask());
+
+        CloseChangesetDialog dialog = new CloseChangesetDialog();
+        dialog.setChangesets(openChangesets);
+        dialog.setVisible(true);
+        if (dialog.isCanceled())
+            return;
+
+        Collection<Changeset> changesetsToClose = dialog.getSelectedChangesets();
+        CloseChangesetTask closeChangesetTask = new CloseChangesetTask(changesetsToClose);
+        Main.worker.submit(closeChangesetTask);
     }
 
-    @Override
-    protected void updateEnabledState() {
-        setEnabled(Main.map != null && OsmApi.getOsmApi().getCurrentChangeset() != null);
-    }
 
-    static class StopChangesetActionTask extends PleaseWaitRunnable {
+    private class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
+
         private boolean cancelled;
+        private OsmServerChangesetReader reader;
+        private List<Changeset> changesets;
         private Exception lastException;
+        private UserInfo userInfo;
 
-        public StopChangesetActionTask() {
-            super(tr("Closing changeset"), false /* don't ignore exceptions */);
+        /**
+         * 
+         * @param model provides the user id of the current user and accepts the changesets
+         * after download
+         */
+        public DownloadOpenChangesetsTask() {
+            super(tr("Downloading open changesets ...", false /* don't ignore exceptions */));
         }
+
         @Override
         protected void cancel() {
             this.cancelled = true;
-            OsmApi.getOsmApi().cancel();
-
+            reader.cancel();
         }
 
         @Override
         protected void finish() {
-            if (cancelled)
-                return;
-            if (lastException != null) {
-                ExceptionDialogUtil.explainException(lastException);
-            }
+            SwingUtilities.invokeLater(
+                    new Runnable() {
+                        public void run() {
+                            if (lastException != null) {
+                                ExceptionDialogUtil.explainException(lastException);
+                            }
+                            onPostDownloadOpenChangesets(DownloadOpenChangesetsTask.this);
+                        }
+                    }
+            );
+        }
+
+        /**
+         * Fetch the user info from the server. This is necessary if we don't know
+         * the users id yet
+         * 
+         * @return the user info
+         * @throws OsmTransferException thrown in case of any communication exception
+         */
+        protected UserInfo fetchUserInfo() throws OsmTransferException {
+            OsmServerUserInfoReader reader = new OsmServerUserInfoReader();
+            return reader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
         }
 
@@ -79 +126 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                OsmApi.getOsmApi().stopChangeset(ChangesetProcessingType.USE_EXISTING_AND_CLOSE, getProgressMonitor().createSubTaskMonitor(1, false));
+                userInfo = fetchUserInfo();
+                if (cancelled)
+                    return;
+                reader = new OsmServerChangesetReader();
+                ChangesetQuery query = new ChangesetQuery().forUser(userInfo.getId()).beingOpen();
+                changesets = reader.queryChangesets(
+                        query,
+                        getProgressMonitor().createSubTaskMonitor(1, false /* not internal */)
+                );
             } catch(Exception e) {
                 if (cancelled)
@@ -86 +141 @@
             }
         }
+
+        public boolean isCancelled() {
+            return cancelled;
+        }
+
+        public List<Changeset> getChangesets() {
+            return changesets;
+        }
+
+        public Exception getLastException() {
+            return lastException;
+        }
     }
 }