Ticket #20025: 20025.reverter.patch

File 20025.reverter.patch, 1.6 KB (added by taylor.smock, 4 years ago)

Use modifyChangesetTags instead of checkUpload in ReverterUploadHook

  • plugins/reverter/src/reverter/ReverterUploadHook.java

    diff --git a/plugins/reverter/src/reverter/ReverterUploadHook.java b/plugins/reverter/src/reverter/ReverterUploadHook.java
    index e4d0711af..36b728b1c 100644
    a b  
    11// License: GPL. For details, see LICENSE file.
    22package reverter;
    33
     4import java.util.Map;
     5import java.util.Objects;
     6
    47import org.openstreetmap.josm.actions.upload.UploadHook;
    58import org.openstreetmap.josm.command.Command;
    69import org.openstreetmap.josm.command.SequenceCommand;
    7 import org.openstreetmap.josm.data.APIDataSet;
    810import org.openstreetmap.josm.data.UndoRedoHandler;
    911import org.openstreetmap.josm.gui.MainApplication;
    1012import org.openstreetmap.josm.plugins.PluginInformation;
    public class ReverterUploadHook implements UploadHook {  
    2527    }
    2628
    2729    @Override
    28     public boolean checkUpload(APIDataSet apiDataSet) {
     30    public void modifyChangesetTags(Map<String, String> tags) {
    2931        if (ReverterPlugin.reverterUsed.get()) {
    3032            for (Command cmd : UndoRedoHandler.getInstance().getUndoCommands()) {
    31                 if (isReverterCmd(cmd)) {
    32                     MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("created_by", pluginString);
     33                if (Objects.equals(MainApplication.getLayerManager().getEditDataSet(), cmd.getAffectedDataSet()) && isReverterCmd(cmd)) {
     34                    tags.put("created_by", pluginString);
    3335                    break;
    3436                }
    3537            }
    3638        }
    37         return true;
    3839    }
    3940
    4041    private static boolean isReverterCmd(Command cmd) {