Changeset 34974 in osm for applications/editors/josm/plugins

Timestamp:

2019-04-12T08:02:04+02:00 (6 years ago)

Author:

gerdp

Message:

see #17540: created_by is not changed when reverting multiple changesets

Location:

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

Files:

• ReverterPlugin.java (modified) (1 diff)
• ReverterUploadHook.java (modified) (1 diff)

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

@@ -25 +25 @@
         JMenu historyMenu = MainApplication.getMenu().dataMenu;
         MainMenu.add(historyMenu, new RevertChangesetAction());
-        UploadAction.registerUploadHook(new ReverterUploadHook(this));
+        UploadAction.registerUploadHook(new ReverterUploadHook(info));
         new RemoteControl().addRequestHandler(RevertChangesetHandler.command, RevertChangesetHandler.class);
     }

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

@@ -4 +4 @@
 import org.openstreetmap.josm.actions.upload.UploadHook;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.PluginInformation;
 
+/**
+ * Upload hook to add tag to new changeset.
+ *
+ */
 public class ReverterUploadHook implements UploadHook {
-    String pluginString;
-    public ReverterUploadHook(ReverterPlugin plugin) {
-        pluginString = "reverter_plugin/" + plugin.getPluginInformation().version;
+    final String pluginString;
+
+    /**
+     * Create new {@link ReverterUploadHook}
+     * @param info plugin information
+     */
+    public ReverterUploadHook(PluginInformation info) {
+        pluginString = "reverter_plugin/" + info.version;
     }
 
     @Override
     public boolean checkUpload(APIDataSet apiDataSet) {
-        if (!ReverterPlugin.reverterUsed) return true;
-        boolean hasRevertions = false;
-        for (Command cmd : UndoRedoHandler.getInstance().commands) {
-            if (cmd instanceof RevertChangesetCommand) {
-                hasRevertions = true;
-                break;
+        if (ReverterPlugin.reverterUsed) {
+            for (Command cmd : UndoRedoHandler.getInstance().commands) {
+                if (isReverterCmd(cmd)) {
+                    MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("created_by", pluginString);
+                    break;
+                }
             }
-        }
-
-        if (hasRevertions) {
-            MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("created_by", "reverter");
         }
         return true;
     }
 
+    private static boolean isReverterCmd(Command cmd) {
+        if (cmd instanceof RevertChangesetCommand)
+            return true;
+        if (cmd instanceof SequenceCommand) {
+            return ((SequenceCommand) cmd).getLastCommand() instanceof RevertChangesetCommand;
+        }
+        return false;
+    }
 }