Ticket #19792: 19792.2.patch

src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -134 +134 @@
      * constructor
      */
     public ConflictResolver() {
-        resolvedCompletely = false;
         build();
         loadIcons();
     }
@@ -239 +238 @@
         setMy(conflict.getMy());
         setTheir(conflict.getTheir());
         this.conflict = conflict;
+        this.resolvedCompletely = false;
         propertiesMerger.populate(conflict);
 
         tabbedPane.setEnabledAt(0, true);

src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -56 +56 @@
     public WayNodesConflictResolverCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
         if (!isFrozen())
             throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command."));
-        return new WayNodesConflictResolverCommand(conflict, getMergedEntries());
+        return new WayNodesConflictResolverCommand(conflict, new ArrayList<>(getMergedEntries()));
     }
 
     @Override

src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -463 +463 @@
 
     @Override
     public void decideRemaining(MergeDecisionType decision) {
-        if (!model.isDecidedCoord()) {
+        if (!model.isDecidedDeletedState()) {
             model.decideDeletedStateConflict(decision);
         }
         if (!model.isDecidedCoord()) {

src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 import javax.swing.table.DefaultTableModel;
@@ -101 +102 @@
         CheckParameterUtil.ensureParameterNotNull(conflict, "conflict");
         if (!isFrozen())
             throw new IllegalArgumentException(tr("Merged members not frozen yet. Cannot build resolution command"));
-        return new RelationMemberConflictResolverCommand(conflict, getMergedEntries());
+        return new RelationMemberConflictResolverCommand(conflict, new ArrayList<>(getMergedEntries()));
     }
 }

src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

@@ -184 +184 @@
     }
 
     public TagConflictResolveCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
-        return new TagConflictResolveCommand(conflict, tagMergeItems);
+        return new TagConflictResolveCommand(conflict, new ArrayList<>(tagMergeItems));
     }
 
     public boolean isResolvedCompletely() {

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

@@ -517 +517 @@
                     if (c != null) {
                         resolver.populate(c);
                         resolver.decideRemaining(type);
-                        Command cmd = resolver.buildResolveCommand();
-                        cmd.executeCommand(); // execute now, see #6529
-                        commands.add(cmd);
+                        commands.add(resolver.buildResolveCommand());
                     }
                 }
             }
-            UndoRedoHandler.getInstance().add(new ResolveConflictsCommand(name, commands), false);
+            UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
             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);
-        }
-    }
-
     class ResolveToMyVersionAction extends ResolveToAction {
         ResolveToMyVersionAction() {
             super(tr("Resolve to my versions"), tr("Resolves all unresolved conflicts to ''my'' version"),