Changeset 3045 in josm for trunk

Timestamp:

2010-02-26T15:42:31+01:00 (15 years ago)

Author:

mjulius

Message:

fixes #4611 - relation dialog - unreported conflict

remove deleted members from new relations

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -108 +108 @@
         super(layer, relation, selectedMembers);
 
-        setRememberWindowGeometry(getClass().getName() + ".geometry", 
+        setRememberWindowGeometry(getClass().getName() + ".geometry",
                 WindowGeometry.centerInWindow(Main.parent, new Dimension(700, 650)));
-        
+
         // initialize the autocompletion infrastructure
         //
@@ -1021 +1021 @@
          */
         protected void applyNewRelation() {
-            // If the user wanted to create a new relation, but hasn't added any members or
-            // tags, don't add an empty relation
-            if (memberTableModel.getRowCount() == 0 && tagEditorPanel.getModel().getKeys().isEmpty())
-                return;
             Relation newRelation = new Relation();
             tagEditorPanel.getModel().applyToPrimitive(newRelation);
             memberTableModel.applyToRelation(newRelation);
+            List<RelationMember> newMembers = new ArrayList<RelationMember>();
+            for (RelationMember rm: newRelation.getMembers()) {
+                if (!rm.getMember().isDeleted()) {
+                    newMembers.add(rm);
+                }
+            }
+            if (newRelation.getMembersCount() != newMembers.size()) {
+                newRelation.setMembers(newMembers);
+                String msg = tr("One or more members of this new relation have been deleted while the relation editor\n" +
+                "was open. They have been removed from the relation members list.");
+                JOptionPane.showMessageDialog(Main.parent, msg, tr("Warning"), JOptionPane.WARNING_MESSAGE);
+            }
+            // If the user wanted to create a new relation, but hasn't added any members or
+            // tags, don't add an empty relation
+            if (newRelation.getMembersCount() == 0 && !newRelation.hasKeys())
+                return;
             Main.main.undoRedo.add(new AddCommand(getLayer(),newRelation));