Changeset 5298 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.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/relation/RelationMemberListMergeModel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -5 +5 @@
 
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.table.DefaultTableModel;
 
 import org.openstreetmap.josm.command.RelationMemberConflictResolverCommand;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -21 +22 @@
  */
 public class RelationMemberListMergeModel extends ListMergeModel<RelationMember>{
-    private DataSet myDataset;
 
     @Override
@@ -60 +60 @@
      * @param my my relation. Must not be null.
      * @param their their relation. Must not be null.
+     * @param mergedMap The map of merged primitives if the conflict results from merging two layers
      *
      * @throws IllegalArgumentException if my is null
      * @throws IllegalArgumentException if their is null
      */
-    public void populate(Relation my, Relation their) {
-        this.myDataset = my.getDataSet();
-
-        CheckParameterUtil.ensureParameterNotNull(my, "my");
-        CheckParameterUtil.ensureParameterNotNull(their, "their");
-
-        getMergedEntries().clear();
-        getMyEntries().clear();
-        getTheirEntries().clear();
+    public void populate(Relation my, Relation their, Map<PrimitiveId, PrimitiveId> mergedMap) {
+        initPopulate(my, their, mergedMap);
 
         for (RelationMember n : my.getMembers()) {
@@ -94 +88 @@
     @Override
     protected RelationMember cloneEntryForMergedList(RelationMember entry) {
-        OsmPrimitive primitive = getMyPrimitive(entry);
-        return new RelationMember(entry.getRole(), primitive);
+        return new RelationMember(entry.getRole(), getMyPrimitive(entry));
     }
 
     @Override
     protected OsmPrimitive getMyPrimitive(RelationMember entry) {
-        return myDataset.getPrimitiveById(entry.getMember());
+        return getMyPrimitiveDefault(entry.getMember());
     }