Changeset 2115 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-09-13T19:30:36+02:00 (17 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)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CloseChangesetAction.java (moved) (moved from trunk/src/org/openstreetmap/josm/actions/StopChangesetAction.java ) (4 diffs)
• UploadAction.java (modified) (9 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;
+        }
     }
 }

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

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.ChangesetProcessingType;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiException;
@@ -176 +175 @@
                         Main.map.mapView.getEditLayer(),
                         apiData.getPrimitives(),
-                        UploadConfirmationHook.getUploadDialog().getChangeset(),
-                        UploadConfirmationHook.getUploadDialog().getChangesetProcessingType()
+                        UploadDialog.getUploadDialog().getChangeset(),
+                        UploadDialog.getUploadDialog().isDoCloseAfterUpload()
                 )
         );
@@ -244 +243 @@
         );
         switch(ret) {
-        case JOptionPane.CLOSED_OPTION: return;
-        case JOptionPane.CANCEL_OPTION: return;
-        case 0: synchronizePrimitive(primitiveType, id); break;
-        case 1: synchronizeDataSet(); break;
-        default:
-            // should not happen
-            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+            case JOptionPane.CLOSED_OPTION: return;
+            case JOptionPane.CANCEL_OPTION: return;
+            case 0: synchronizePrimitive(primitiveType, id); break;
+            case 1: synchronizeDataSet(); break;
+            default:
+                // should not happen
+                throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
         }
     }
@@ -284 +283 @@
         );
         switch(ret) {
-        case JOptionPane.CLOSED_OPTION: return;
-        case 1: return;
-        case 0: synchronizeDataSet(); break;
-        default:
-            // should not happen
-            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+            case JOptionPane.CLOSED_OPTION: return;
+            case 1: return;
+            case 0: synchronizeDataSet(); break;
+            default:
+                // should not happen
+                throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
         }
     }
@@ -457 +456 @@
 
     static public class UploadConfirmationHook implements UploadHook {
-        static private UploadDialog uploadDialog;
-
-        static public UploadDialog getUploadDialog() {
-            if (uploadDialog == null) {
-                uploadDialog = new UploadDialog();
-            }
-            return uploadDialog;
-        }
 
         public boolean checkUpload(APIDataSet apiData) {
-            final UploadDialog dialog = getUploadDialog();
+            final UploadDialog dialog = UploadDialog.getUploadDialog();
             dialog.setUploadedPrimitives(apiData.getPrimitivesToAdd(),apiData.getPrimitivesToUpdate(), apiData.getPrimitivesToDelete());
             dialog.setVisible(true);
@@ -477 +468 @@
     }
 
-    public UploadDiffTask createUploadTask(OsmDataLayer layer, Collection<OsmPrimitive> toUpload, Changeset changeset, ChangesetProcessingType changesetProcessingType) {
-        return new UploadDiffTask(layer, toUpload, changeset, changesetProcessingType);
-    }
-
+    public UploadDiffTask createUploadTask(OsmDataLayer layer, Collection<OsmPrimitive> toUpload, Changeset changeset, boolean closeChangesetAfterUpload) {
+        return new UploadDiffTask(layer, toUpload, changeset, closeChangesetAfterUpload);
+    }
+
+    /**
+     * The task for uploading a collection of primitives
+     *
+     */
     public class UploadDiffTask extends  PleaseWaitRunnable {
         private boolean uploadCancelled = false;
@@ -488 +483 @@
         private OsmDataLayer layer;
         private Changeset changeset;
-        private ChangesetProcessingType changesetProcessingType;
-
-        private UploadDiffTask(OsmDataLayer layer, Collection <OsmPrimitive> toUpload, Changeset changeset, ChangesetProcessingType changesetProcessingType) {
+        private boolean closeChangesetAfterUpload;
+
+        /**
+         * 
+         * @param layer  the OSM data layer for which data is uploaded
+         * @param toUpload the collection of primitives to upload
+         * @param changeset the changeset to use for uploading
+         * @param closeChangesetAfterUpload true, if the changeset is to be closed after uploading
+         */
+        private UploadDiffTask(OsmDataLayer layer, Collection <OsmPrimitive> toUpload, Changeset changeset, boolean closeChangesetAfterUpload) {
             super(tr("Uploading data for layer ''{0}''", layer.getName()),false /* don't ignore exceptions */);
             this.toUpload = toUpload;
             this.layer = layer;
             this.changeset = changeset;
-            this.changesetProcessingType = changesetProcessingType == null ? ChangesetProcessingType.USE_NEW_AND_CLOSE : changesetProcessingType;
+            this.closeChangesetAfterUpload = closeChangesetAfterUpload;
         }
 
@@ -502 +504 @@
             try {
                 ProgressMonitor monitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-                writer.uploadOsm(layer.data.version, toUpload, changeset,changesetProcessingType, monitor);
+                writer.uploadOsm(layer.data.version, toUpload, changeset,closeChangesetAfterUpload, monitor);
             } catch (Exception sxe) {
                 if (uploadCancelled) {
@@ -525 +527 @@
                 handleFailedUpload(lastException);
             } else {
+                // run post upload action on the layer
+                //
                 layer.onPostUploadToServer();
+                // refresh changeset dialog with the updated changeset
+                //
+                UploadDialog.getUploadDialog().setOrUpdateChangeset(changeset);
             }
         }