Changeset 17063 in josm

Timestamp:

2020-09-27T14:55:21+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19353: DataIntegrityProblemException: Relation member must be part of the same dataset as relation

• recognize members which are not part of dataset (happens when undoing an add action)
• remove dead code which showed popup
• change logic which enables the refresh button (logic taken from CancelAction)

Location:

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

Files:

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

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

@@ -364 +364 @@
      */
     public void applyToRelation(Relation relation) {
-        relation.setMembers(members.stream()
-                .filter(rm -> !rm.getMember().isDeleted()).collect(Collectors.toList()));
+        relation.setMembers(
+                members.stream().filter(rm -> !rm.getMember().isDeleted() && rm.getMember().getDataSet() != null)
+                        .collect(Collectors.toList()));
     }
 

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

@@ -68 +68 @@
     @Override
     public void updateEnabledState() {
-        Relation relation = editorAccess.getEditor().getRelation();
         Relation snapshot = editorAccess.getEditor().getRelationSnapshot();
-        setEnabled(snapshot != null && (
-            !relation.hasEqualTechnicalAttributes(snapshot) ||
-            !relation.hasEqualSemanticAttributes(snapshot)
-        ));
+        setEnabled((!getMemberTableModel().hasSameMembersAs(snapshot) || getTagModel().isDirty())
+                && !(snapshot == null && getTagModel().getTags().isEmpty()));
     }
 

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

@@ -5 +5 @@
 
 import java.awt.Component;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -18 +16 @@
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
@@ -51 +48 @@
         tagEditorModel.applyToPrimitive(newRelation);
         getMemberTableModel().applyToRelation(newRelation);
-        List<RelationMember> newMembers = newRelation.getMembers().stream()
-                .filter(rm -> !rm.getMember().isDeleted())
-                .collect(Collectors.toList());
-        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(MainApplication.getMainFrame(), 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