Ignore:
Timestamp:
2012-06-24T21:02:36+02:00 (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

    r5266 r5298  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.conflict;
     3
     4import java.util.Map;
    35
    46import org.openstreetmap.josm.data.osm.OsmPrimitive;
     
    2224    private final T their;
    2325    private final boolean isMyDeleted;
     26   
     27    // mergedMap is only set if the conflict results from merging two layers
     28    private Map<PrimitiveId, PrimitiveId> mergedMap;
    2429
    2530    public Conflict(T my, T their) {
     
    111116        return isMyDeleted;
    112117    }
     118
     119    public final Map<PrimitiveId, PrimitiveId> getMergedMap() {
     120        return mergedMap;
     121    }
     122
     123    public final void setMergedMap(Map<PrimitiveId, PrimitiveId> mergedMap) {
     124        this.mergedMap = mergedMap;
     125    }
    113126}
Note: See TracChangeset for help on using the changeset viewer.