Changeset 35400 in osm for applications/editors/josm/plugins/reverter

Timestamp:

2020-03-27T15:56:08+01:00 (5 years ago)

Author:

gerdp

Message:

fix #1josm5906: Isn't properly reverting multiple changesets

• execute commands for each reverted changeset
• change RevertChangesetCommand so that it just collects already executed commands (see #josm17401)

Location:

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

Files:

• RevertChangesetCommand.java (modified) (2 diffs)
• RevertChangesetTask.java (modified) (4 diffs)

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

@@ -19 +19 @@
      * Create the command by specifying the list of commands to execute.
      * @param name The description text
-     * @param sequenz The sequence that should be executed.
+     * @param sequenz The sequence that was already executed.
      */
     public RevertChangesetCommand(String name, Collection<Command> sequenz) {
         super(name, sequenz);
         ReverterPlugin.reverterUsed = true;
+        setSequenceComplete(true);
     }
 
@@ -36 +37 @@
     }
 
+    @Override
+    public void undoCommand() {
+        getAffectedDataSet().update(super::undoCommand);
+    }
+
+    @Override
+    public boolean executeCommand() {
+        return getAffectedDataSet().update(super::executeCommand);
+    }
+
 }

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

@@ -15 +15 @@
 
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
@@ -99 +98 @@
                 newLayer = false; // reuse layer for subsequent reverts
             } catch (OsmTransferException e) {
-                Logging.error(e);
+                                if (!allcmds.isEmpty()) {
+                                        GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size()));
+                                }
+                                Logging.error(e);
                 throw e;
             } catch (UserCancelException e) {
+                                if (!allcmds.isEmpty()) {
+                                        GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size()));
+                                }
                 Logging.warn("Revert canceled");
                 Logging.trace(e);
@@ -108 +113 @@
         }
         if (!allcmds.isEmpty()) {
-            Command cmd = allcmds.size() == 1 ? allcmds.get(0) : new SequenceCommand(tr("Revert changesets"), allcmds);
+            Command cmd = allcmds.size() == 1 ? allcmds.get(0) : new RevertChangesetCommand(tr("Revert changesets"), allcmds);
             GuiHelper.runInEDT(() -> {
-                UndoRedoHandler.getInstance().add(cmd);
+                UndoRedoHandler.getInstance().add(cmd, false);
                 if (numberOfConflicts > 0) {
                     MainApplication.getMap().conflictDialog.warnNumNewConflicts(numberOfConflicts);
@@ -169 +174 @@
                 numberOfConflicts++;
             }
+            c.executeCommand();
         }
         final String desc;