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

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

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Map;
 
 import javax.swing.table.DefaultTableModel;
@@ -10 +11 @@
 import org.openstreetmap.josm.command.WayNodesConflictResolverCommand;
 import org.openstreetmap.josm.data.conflict.Conflict;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
 import org.openstreetmap.josm.gui.conflict.pair.ListRole;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 public class NodeListMergeModel extends ListMergeModel<Node>{
-    private DataSet myDataset;
 
     /**
@@ -27 +26 @@
      * @param my  my way (i.e. the way in the local dataset)
      * @param their their way (i.e. the way in the server dataset)
+     * @param mergedMap The map of merged primitives if the conflict results from merging two layers
      * @exception IllegalArgumentException thrown, if my is null
      * @exception IllegalArgumentException  thrown, if their is null
      */
-    public void populate(Way my, Way their) {
-        this.myDataset = my.getDataSet();
+    public void populate(Way my, Way their, Map<PrimitiveId, PrimitiveId> mergedMap) {
+        initPopulate(my, their, mergedMap);
 
-        CheckParameterUtil.ensureParameterNotNull(my, "my");
-        CheckParameterUtil.ensureParameterNotNull(their, "their");
-        getMergedEntries().clear();
-        getMyEntries().clear();
-        getTheirEntries().clear();
         for (Node n : my.getNodes()) {
             getMyEntries().add(n);
@@ -85 +80 @@
         return (Node) getMyPrimitive(entry);
     }
-
-    @Override
-    protected OsmPrimitive getMyPrimitive(Node entry) {
-        return myDataset.getPrimitiveById(entry);
-    }
-
 }