Changeset 35409 in osm for applications/editors/josm

Timestamp:

2020-04-04T07:40:00+02:00 (5 years ago)

Author:

gerdp

Message:

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

• revert temp. changes done in o35407 and increase main version

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/DataSetCommandMerger.java (modified) (1 diff)
• src/reverter/RevertChangesetCommand.java (modified) (2 diffs)
• src/reverter/RevertChangesetTask.java (modified) (4 diffs)

applications/editors/josm/plugins/reverter/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Reverter: fix deleted/redacted relation members"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="15520"/>
+    <property name="plugin.main.version" value="16205"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -53 +53 @@
 
     private void addChangeCommandIfNotEquals(OsmPrimitive target, OsmPrimitive newTarget, boolean nominal) {
-        if (target.isIncomplete() != newTarget.isIncomplete() || target.isDeleted() != newTarget.isDeleted()
-                || target.isVisible() != newTarget.isVisible()
-                || !getNonDiscardableTags(target).equals(getNonDiscardableTags(newTarget))) {
+                if (!target.hasEqualSemanticAttributes(newTarget) || 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 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;