Ticket #17540: 17540.patch

src/reverter/ReverterUploadHook.java

@@ -3 +3 @@
 
 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;
 
+/**
+ * Upload hook to add tag to new changeset.
+ *
+ */
 public class ReverterUploadHook implements UploadHook {
-    String pluginString;
+    final String pluginString;
     public ReverterUploadHook(ReverterPlugin plugin) {
         pluginString = "reverter_plugin/" + plugin.getPluginInformation().version;
     }
@@ -15 +20 @@
 
     @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;
+                }
             }
         }
+        return true;
+    }
 
-        if (hasRevertions) {
-            MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("created_by", "reverter");
+    private static boolean isReverterCmd(Command cmd) {
+        if (cmd instanceof RevertChangesetCommand)
+            return true;
+        if (cmd instanceof SequenceCommand) {
+            return ((SequenceCommand) cmd).getLastCommand() instanceof RevertChangesetCommand;
         }
-        return true;
+        return false;
     }
-
 }