Changeset 2949 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation

Timestamp:

2010-02-07T22:54:58+01:00 (14 years ago)

Author:

jttt

Message:

Show only one message box in conflicts dialog when multiple members are deleted, use clone method for copyAll method

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import java.util.List;
 
-import javax.swing.JOptionPane;
 import javax.swing.table.DefaultTableModel;
 
@@ -14 +13 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
 import org.openstreetmap.josm.gui.conflict.pair.ListRole;
@@ -98 +96 @@
     @Override
     protected RelationMember cloneEntryForMergedList(RelationMember entry) {
-        OsmPrimitive primitive = myDataset.getPrimitiveById(entry.getMember());
-        if (primitive.isDeleted()) {
-            JOptionPane.showMessageDialog(null,
-                    tr("Primitive {0} cannot be added to the relation because it was deleted.",
-                            primitive.getDisplayName(DefaultNameFormatter.getInstance())));
-            return null;
-        } else
-            return new RelationMember(entry.getRole(), primitive);
+        OsmPrimitive primitive = getMyPrimitive(entry);
+        return new RelationMember(entry.getRole(), primitive);
+    }
+
+    @Override
+    protected OsmPrimitive getMyPrimitive(RelationMember entry) {
+        return myDataset.getPrimitiveById(entry.getMember());
     }