Changeset 17273 in josm

Timestamp:

2020-10-27T14:50:10+01:00 (4 years ago)

Author:

GerdP

Message:

see #6529: Deleting locally referenced objects in conflict resolution breaks data integrity

• Correct calculation of commands when a selection of conflicts is resolved to "my" or "their" version

The old code computed a list of commands before executing any of them. This fails when the execution of a command changes the data that is used by following commands. I don't know if this fixes all problems. I expected that these conflicts also require a special order, but there is no code to sort them. The displayed list doesn't seem to be ordered.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -518 +518 @@
                         resolver.populate(c);
                         resolver.decideRemaining(type);
-                        commands.add(resolver.buildResolveCommand());
+                        Command cmd = resolver.buildResolveCommand();
+                        cmd.executeCommand(); // execute now, see #6529
+                        commands.add(cmd);
                     }
                 }
             }
-            UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
+            UndoRedoHandler.getInstance().add(new ResolveConflictsCommand(name, commands), false);
             refreshView();
+        }
+    }
+
+    private static class ResolveConflictsCommand extends SequenceCommand {
+        // just  a wrapper for already executed commands
+        ResolveConflictsCommand(String name, Collection<Command> sequenz) {
+            super(name, sequenz, true);
+            setSequenceComplete(true);
         }
     }