Changeset 5298 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.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/data/osm/DataSetMerger.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -134 +134 @@
             return null;
         return targetDataSet.getPrimitiveById(targetId);
+    }
+    
+    protected void addConflict(Conflict<?> c) {
+        c.setMergedMap(mergedMap);
+        conflicts.add(c);
+    }
+
+    protected void addConflict(OsmPrimitive my, OsmPrimitive their) {
+        addConflict(new Conflict<OsmPrimitive>(my, their));
     }
 
@@ -188 +197 @@
                         // add a conflict and don't delete the object
                         if (!objectsToDelete.contains(referrer)) {
-                            conflicts.add(target, source);
+                            addConflict(target, source);
                             it.remove();
                             flag = true;
@@ -235 +244 @@
                 newNodes.add(targetNode);
                 if (targetNode.isDeleted() && !conflicts.hasConflictForMy(targetNode)) {
-                    conflicts.add(new Conflict<OsmPrimitive>(targetNode, sourceNode, true));
+                    addConflict(new Conflict<OsmPrimitive>(targetNode, sourceNode, true));
                     targetNode.setDeleted(false);
                 }
@@ -263 +272 @@
             newMembers.add(newMember);
             if (targetMember.isDeleted() && !conflicts.hasConflictForMy(targetMember)) {
-                conflicts.add(new Conflict<OsmPrimitive>(targetMember, sourceMember.getMember(), true));
+                addConflict(new Conflict<OsmPrimitive>(targetMember, sourceMember.getMember(), true));
                 targetMember.setDeleted(false);
             }
@@ -317 +326 @@
             for (OsmPrimitive referrer: source.getReferrers()) {
                 if (targetDataSet.getPrimitiveById(referrer.getPrimitiveId()) == null) {
-                    conflicts.add(new Conflict<OsmPrimitive>(target, source, true));
+                    addConflict(new Conflict<OsmPrimitive>(target, source, true));
                     target.setDeleted(false);
                     break;
@@ -352 +361 @@
             // this have to be resolved manually.
             //
-            conflicts.add(target,source);
+            addConflict(target,source);
         } else if (! target.hasEqualSemanticAttributes(source)) {
             // target is modified and is not semantically equal with source. Can't automatically
             // resolve the differences
             // =>  create a conflict
-            conflicts.add(target,source);
+            addConflict(target,source);
         } else {
             // clone from other. mergeFrom will mainly copy