Changeset 5298 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

Timestamp:

2012-06-24T21:02:36+02:00 (12 years ago)

Author:

Don-vip

Message:

see #4899, see #7266, see #7333: Resolved NPE in conflict manager when copying a member created by merging two layers

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (modified) (1 diff)

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

@@ -57 +57 @@
         Way myWay = (Way)conflict.getMy();
         Way theirWay = (Way)conflict.getTheir();
-        ((NodeListMergeModel)model).populate(myWay, theirWay);
+        ((NodeListMergeModel)model).populate(myWay, theirWay, conflict.getMergedMap());
         myEntriesTable.setLayer(findLayerFor(myWay));
         theirEntriesTable.setLayer(findLayerFor(theirWay));