Changeset 35407 in osm

Timestamp:

2020-04-04T07:29:00+02:00 (4 years ago)

Author:

gerdp

Message:

see #19028: Plugin reverter uses a more recent API that minimal requested

• revert changes down to 35400 to be able to dist a release that works with older JOSM versions

Location:

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

Files:

• DataSetCommandMerger.java (modified) (1 diff)
• RevertChangesetCommand.java (modified) (2 diffs)
• RevertChangesetTask.java (modified) (4 diffs)

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

@@ -53 +53 @@
 
     private void addChangeCommandIfNotEquals(OsmPrimitive target, OsmPrimitive newTarget, boolean nominal) {
-                if (!target.hasEqualSemanticAttributes(newTarget) || target.isDeleted() != newTarget.isDeleted()
-                                || target.isVisible() != newTarget.isVisible()
-                                || !getNonDiscardableTags(target).equals(getNonDiscardableTags(newTarget))) {
+        if (target.isIncomplete() != newTarget.isIncomplete() || target.isDeleted() != newTarget.isDeleted()
+                || target.isVisible() != newTarget.isVisible()
+                || !getNonDiscardableTags(target).equals(getNonDiscardableTags(newTarget))) {
             cmds.add(new ChangeCommand(target, newTarget));
             if (nominal) {

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 was already executed.
+     * @param sequenz The sequence that should be executed.
      */
     public RevertChangesetCommand(String name, Collection<Command> sequenz) {
         super(name, sequenz);
         ReverterPlugin.reverterUsed = true;
-        setSequenceComplete(true);
     }
 
@@ -37 +36 @@
     }
 
-    @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;
@@ -98 +99 @@
                 newLayer = false; // reuse layer for subsequent reverts
             } catch (OsmTransferException e) {
-                                if (!allcmds.isEmpty()) {
-                                        GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size()));
-                                }
-                                Logging.error(e);
+                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);
@@ -113 +108 @@
         }
         if (!allcmds.isEmpty()) {
-            Command cmd = allcmds.size() == 1 ? allcmds.get(0) : new RevertChangesetCommand(tr("Revert changesets"), allcmds);
+            Command cmd = allcmds.size() == 1 ? allcmds.get(0) : new SequenceCommand(tr("Revert changesets"), allcmds);
             GuiHelper.runInEDT(() -> {
-                UndoRedoHandler.getInstance().add(cmd, false);
+                UndoRedoHandler.getInstance().add(cmd);
                 if (numberOfConflicts > 0) {
                     MainApplication.getMap().conflictDialog.warnNumNewConflicts(numberOfConflicts);
@@ -174 +169 @@
                 numberOfConflicts++;
             }
-            c.executeCommand();
         }
         final String desc;