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

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -15 +15 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Observable;
 
@@ -21 +22 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JOptionPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -30 +34 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -63 +68 @@
  * @see ListMerger
  */
-public abstract class ListMergeModel<T> extends Observable {
+public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
     public static final String FROZEN_PROP = ListMergeModel.class.getName() + ".frozen";
 
@@ -81 +86 @@
     private boolean isFrozen = false;
     private final ComparePairListModel comparePairListModel;
+    
+    private DataSet myDataset;
+    private Map<PrimitiveId, PrimitiveId> mergedMap;
 
     /**
@@ -118 +126 @@
      * @return Primitive from my dataset referenced by entry
      */
-    protected abstract OsmPrimitive getMyPrimitive(T entry);
+    protected OsmPrimitive getMyPrimitive(T entry) {
+        return getMyPrimitiveDefault(entry);
+    }
+    
+    protected final OsmPrimitive getMyPrimitiveDefault(PrimitiveId entry) {
+        OsmPrimitive result = myDataset.getPrimitiveById(entry);
+        if (result == null && mergedMap != null) {
+            PrimitiveId id = mergedMap.get(entry);
+            if (id == null && entry instanceof OsmPrimitive) {
+                id = mergedMap.get(((OsmPrimitive)entry).getPrimitiveId());
+            }
+            if (id != null) {
+                result = myDataset.getPrimitiveById(id);
+            }
+        }
+        return result;
+    }
 
     protected void buildMyEntriesTableModel() {
@@ -310 +334 @@
         getMergedEntries().clear();
         fireModelDataChanged();
+    }
+    
+    protected final void initPopulate(OsmPrimitive my, OsmPrimitive their, Map<PrimitiveId, PrimitiveId> mergedMap) {
+        CheckParameterUtil.ensureParameterNotNull(my, "my");
+        CheckParameterUtil.ensureParameterNotNull(their, "their");
+        this.myDataset = my.getDataSet();
+        this.mergedMap = mergedMap;
+        getMergedEntries().clear();
+        getMyEntries().clear();
+        getTheirEntries().clear();
     }