Changeset 29359 in osm for applications/editors

Timestamp:

2013-03-13T22:01:18+01:00 (12 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm8503 - warn about conflicts

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/RevertChangesetTask.java (modified) (2 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="5765"/>
+    <property name="plugin.main.version" value="5775"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.ConflictAddCommand;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
@@ -87 +88 @@
         final Command cmd = new RevertChangesetCommand(tr(revertType == RevertType.FULL ? "Revert changeset #{0}" :
                 "Partially revert changeset #{0}",changesetId),cmds);
+        int n = 0;
+        for (Command c : cmds) {
+            if (c instanceof ConflictAddCommand) {
+                n++;
+            }
+        }
+        final int newConflicts = n;
         GuiHelper.runInEDT(new Runnable() {
             @Override
             public void run() {
                 Main.main.undoRedo.add(cmd);
+                if (newConflicts > 0) {
+                    Main.map.conflictDialog.warnNumNewConflicts(newConflicts);
+                }
             }
         });