Changeset 32005 in osm for applications/editors/josm

Timestamp:

2016-01-18T21:58:38+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/reverter - Update to core changes - see #josm4003 see #josm12400

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/ReverterUploadHook.java (modified) (3 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9241"/>
+    <property name="plugin.main.version" value="9514"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -1 +1 @@
 package reverter;
-
-import java.util.Map;
 
 import org.openstreetmap.josm.Main;
@@ -7 +5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.APIDataSet;
-import org.openstreetmap.josm.data.Version;
-import org.openstreetmap.josm.gui.io.UploadDialog;
 
 public class ReverterUploadHook implements UploadHook {
@@ -26 +22 @@
         }
 
-        UploadDialog ud = UploadDialog.getUploadDialog();
-        Map<String, String> tags = ud.getDefaultChangesetTags();
-        String created_by = tags.get("created_by");
-        if (created_by == null || "".equals(created_by)) {
-            if (hasRevertions) {
-                tags.put("created_by", Version.getInstance().getAgentString(false) + ";" + pluginString);
-                ud.setDefaultChangesetTags(tags);
-            }
-            return true;
+        if (hasRevertions) {
+            Main.main.getCurrentDataSet().addChangeSetTag("created_by", "reverter");
         }
-        if (hasRevertions) {
-            if (!created_by.contains(pluginString)) {
-                tags.put("created_by", created_by + ";" + pluginString);
-            }
-        } else {
-            if (created_by.contains(";" + pluginString)) {
-                tags.put("created_by", created_by.replace(";" + pluginString, ""));
-            }
-        }
-        ud.setDefaultChangesetTags(tags);
         return true;
     }