Changeset 17340 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

Timestamp:

2020-11-23T20:29:07+01:00 (5 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)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) (2 diffs)

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);