Changeset 11684 in josm for trunk

Timestamp:

2017-03-05T02:38:09+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14193 - make sure deleted objects are not added to relations, do not create useless commands if as a result, the relation is not changed

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• MemberTableModel.java (modified) (2 diffs)
• actions/SavingAction.java (modified) (1 diff)

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

@@ -13 +13 @@
 import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 import javax.swing.DefaultListSelectionModel;
@@ -357 +358 @@
      */
     public void applyToRelation(Relation relation) {
-        relation.setMembers(members);
+        relation.setMembers(members.stream()
+                .filter(rm -> !rm.getMember().isDeleted()).collect(Collectors.toList()));
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java

@@ -105 +105 @@
         tagEditorModel.applyToPrimitive(editedRelation);
         memberTableModel.applyToRelation(editedRelation);
-        Main.main.undoRedo.add(new ChangeCommand(editor.getRelation(), editedRelation));
-        layer.data.fireSelectionChanged();
+        if (!editedRelation.hasEqualSemanticAttributes(editor.getRelation(), false)) {
+            Main.main.undoRedo.add(new ChangeCommand(editor.getRelation(), editedRelation));
+            layer.data.fireSelectionChanged();
+        }
     }