Changeset 31596 in osm for applications/editors/josm

Timestamp:

2015-10-05T21:45:36+02:00 (9 years ago)

Author:

simon04

Message:

JOSM/reverter: Support multiple changesets at the same time - fixes #josm11699

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• ChangesetIdQuery.java (modified) (4 diffs)
• ChangesetIdsTextField.java (added)
• RevertChangesetAction.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java

@@ -8 +8 @@
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -26 +27 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.widgets.ChangesetIdTextField;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
@@ -35 +35 @@
 public class ChangesetIdQuery extends ExtendedDialog {
     private final JPanel panel = new JPanel(new GridBagLayout());
-    private final ChangesetIdTextField tcid = new ChangesetIdTextField();
+    private final ChangesetIdsTextField tcid = new ChangesetIdsTextField();
     private final HistoryComboBox cbId = new HistoryComboBox();
     private final ButtonGroup bgRevertType = new ButtonGroup();
@@ -43 +43 @@
     private final JCheckBox cbNewLayer = new JCheckBox(tr("Download as new layer"));
     
-    public int getChangesetId() {
-        return tcid.getChangesetId();
+    public Collection<Integer> getIdsInReverseOrder() {
+        return tcid.getIdsInReverseOrder();
     }
     

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Collection;
 
 import org.openstreetmap.josm.Main;
@@ -27 +28 @@
         final ChangesetIdQuery dlg = new ChangesetIdQuery();
         if (dlg.showDialog().getValue() != 1) return;
-        final int changesetId = dlg.getChangesetId();
+        final Collection<Integer> changesetIds = dlg.getIdsInReverseOrder();
         final RevertType revertType = dlg.getRevertType();
-        if (changesetId == 0) return;
         if (revertType == null) return;
 
-        boolean newLayer = dlg.isNewLayerRequired();
-        Main.worker.submit(new RevertChangesetTask(changesetId, revertType, newLayer, newLayer));
+        final boolean newLayer = dlg.isNewLayerRequired();
+        final boolean autoConfirmDownload = newLayer || changesetIds.size() > 1;
+        for (Integer changesetId : changesetIds) {
+            Main.worker.submit(new RevertChangesetTask(changesetId, revertType, autoConfirmDownload, newLayer));
+        }
     }
 }