Ticket #24444: 24444.patch

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

@@ -160 +160 @@
      * A list of listeners that need to be notified on clipboard content changes.
      */
     private final ArrayList<FlavorListener> clipboardListeners = new ArrayList<>();
+    private boolean isSaving;
 
     /**
      * Creates a new relation editor for the given relation. The relation will be saved if the user
@@ -1070 +1071 @@
             } else if (isDirtyRelation()) {
                 if (!isDirtyEditor()) {
                     reloadDataFromRelation();
-                } else {
+                } else if (!isSaving) {
                     new Notification(tr("Relation modified outside of relation editor with pending changes. Conflict resolution required."))
                     .setIcon(JOptionPane.WARNING_MESSAGE).show();
                 }
@@ -1085 +1086 @@
         return (snapshot != null && !memberTableModel.hasSameMembersAs(snapshot)) ||
                 tagEditorPanel.getModel().isDirty() || relation == null || relation.getDataSet() == null;
     }
+
+    @Override
+    public void setIsSaving(boolean b) {
+        isSaving = b;
+    }
 }

src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java

@@ -66 +66 @@
     boolean isDirtyEditor();
 
     /**
+     * Set the isSaving flag to the given value
+     * @param b the flag value
+     * @since xxx
+     */
+    void setIsSaving(boolean b);
+
+    /**
      * Reloads data from relation.
      */
     void reloadDataFromRelation();

src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -115 +115 @@
 
     @Override
     public final void setRelation(Relation relation) {
+        setIsSaving(false);
         setRelationSnapshot((relation == null) ? null : new Relation(relation));
         Relation oldValue = this.relation;
         this.relation = relation;

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

@@ -171 +171 @@
                         warnDoubleConflict();
                         return false;
                     }
+                    getEditor().setIsSaving(true);
                     applyExistingConflictingRelation(getTagModel());
                     hideEditor();
                     return false;
@@ -177 +178 @@
                 } else
                     return false;
             } else {
+                getEditor().setIsSaving(true);
                 applyExistingNonConflictingRelation(getTagModel());
             }
         }

test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java

@@ -122 +122 @@
             public OsmDataLayer getLayer() {
                 return layer;
             }
+
+            @Override
+            public void setIsSaving(boolean b) {
+                // do nothing
+            }
         };
     }