Changeset 17340 in josm for trunk

Timestamp:

2020-11-23T20:29:07+01:00 (4 years ago)

Author:

GerdP

Message:

fix #19792: Error during conflict resolution after complex import operation

• ConflictResolver: initialize resolvedCompletely in populate()
• fix typo in PropertiesMerger
• create copies of lists in buildResolveCommand() implementations
• revert r17273 (not needed)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/pair/ConflictResolver.java (modified) (2 diffs)
• conflict/pair/nodes/NodeListMergeModel.java (modified) (1 diff)
• conflict/pair/properties/PropertiesMerger.java (modified) (1 diff)
• conflict/pair/relation/RelationMemberListMergeModel.java (modified) (2 diffs)
• conflict/pair/tags/TagMergeModel.java (modified) (1 diff)
• dialogs/ConflictDialog.java (modified) (1 diff)

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

@@ -135 +135 @@
      */
     public ConflictResolver() {
-        resolvedCompletely = false;
         build();
         loadIcons();
@@ -240 +239 @@
         setTheir(conflict.getTheir());
         this.conflict = conflict;
+        this.resolvedCompletely = false;
         propertiesMerger.populate(conflict);
 

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

@@ -57 +57 @@
         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()));
     }
 

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

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.Map;
 
@@ -102 +103 @@
         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()));
     }
 }

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

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

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

@@ -518 +518 @@
                         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);
         }
     }