Ticket #20025: 20025.core.patch

File 20025.core.patch, 1.3 KB (added by taylor.smock, 4 years ago)

Call UploadHook#modifyChangeSetTags prior to showing the user the upload dialog _for non-late upload hooks_.

  • src/org/openstreetmap/josm/actions/UploadAction.java 

    diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index 9d085ae856..909a5837f0 100644
    a b public class UploadAction extends AbstractUploadAction {  
    242242        final UploadDialog dialog = UploadDialog.getUploadDialog();
    243243        dialog.setUploadedPrimitives(apiData);
    244244        dialog.initLifeCycle(layer.getDataSet());
     245        Map<String, String> originalChangesetTags = dialog.getChangeset().getKeys();
     246        for (UploadHook hook : UPLOAD_HOOKS) {
     247            hook.modifyChangesetTags(originalChangesetTags);
     248        }
    245249        dialog.setVisible(true);
    246250        dialog.rememberUserInput();
    247251        if (dialog.isCanceled()) {
    … … public class UploadAction extends AbstractUploadAction {  
    259263        // Any hooks want to change the changeset tags?
    260264        Changeset cs = dialog.getChangeset();
    261265        Map<String, String> changesetTags = cs.getKeys();
    262         for (UploadHook hook : UPLOAD_HOOKS) {
    263             hook.modifyChangesetTags(changesetTags);
    264         }
    265266        for (UploadHook hook : LATE_UPLOAD_HOOKS) {
    266267            hook.modifyChangesetTags(changesetTags);
    267268        }