Changeset 2882 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-01-23T14:42:25+01:00 (15 years ago)

Author:

jttt

Message:

Fixed #4409 after confict management: nodes are not selectable

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• nodes/NodeListMergeModel.java (modified) (4 diffs)
• relation/RelationMemberListMergeModel.java (modified) (1 diff)

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

@@ -5 +5 @@
 
 import java.util.ArrayList;
-import java.util.logging.Logger;
 
+import javax.swing.JOptionPane;
 import javax.swing.table.DefaultTableModel;
 
 import org.openstreetmap.josm.command.WayNodesConflictResolverCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
 import org.openstreetmap.josm.gui.conflict.pair.ListRole;
@@ -17 +19 @@
 
 public class NodeListMergeModel extends ListMergeModel<Node>{
+    //private static final Logger logger = Logger.getLogger(NodeListMergeModel.class.getName());
 
-    private static final Logger logger = Logger.getLogger(NodeListMergeModel.class.getName());
+    private DataSet myDataset;
 
     /**
@@ -30 +33 @@
      */
     public void populate(Way my, Way their) {
+        this.myDataset = my.getDataSet();
+
         CheckParameterUtil.ensureParameterNotNull(my, "my");
         CheckParameterUtil.ensureParameterNotNull(their, "their");
@@ -84 +89 @@
     @Override
     protected Node cloneEntryForMergedList(Node entry) {
-        return entry;
+        Node node = (Node) myDataset.getPrimitiveById(entry);
+        if (node.isDeleted()) {
+            JOptionPane.showMessageDialog(null, tr("Node {0} cannot be added to the way because it was deleted", node.getDisplayName(DefaultNameFormatter.getInstance())));
+            return null;
+        } else
+            return node;
     }
 }

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

@@ -101 +101 @@
         if (primitive.isDeleted()) {
             JOptionPane.showMessageDialog(null,
-                    tr("Primitive {0} cannot be added to the relation because it was removed.",
+                    tr("Primitive {0} cannot be added to the relation because it was deleted.",
                             primitive.getDisplayName(DefaultNameFormatter.getInstance())));
             return null;