Changeset 5298 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2012-06-24T21:02:36+02:00 (13 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/conflict/Conflict.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.conflict;
+
+import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -22 +24 @@
     private final T their;
     private final boolean isMyDeleted;
+    
+    // mergedMap is only set if the conflict results from merging two layers
+    private Map<PrimitiveId, PrimitiveId> mergedMap;
 
     public Conflict(T my, T their) {
@@ -111 +116 @@
         return isMyDeleted;
     }
+
+    public final Map<PrimitiveId, PrimitiveId> getMergedMap() {
+        return mergedMap;
+    }
+
+    public final void setMergedMap(Map<PrimitiveId, PrimitiveId> mergedMap) {
+        this.mergedMap = mergedMap;
+    }
 }