Too many wrong notifications "Relation modified outside of relation editor with pending changes. Conflict resolution required"

[GerdP]

What steps will reproduce the problem?

1. Open an existing relation
2. change e.g. the order of two members
3. Press the save button to save the change

What is the expected result?

Relation is modified, save button is disabled without any notification

What happens instead?

Relation is modified, save button is disabled and notification Relation modified outside of relation editor with pending changes. Conflict resolution required
is shown.

Please provide any additional information below. Attach a screenshot if possible.

This is a regression of r19432 in #24423 which tried to fix the changes for #21840.

Revision:19436
Is-Local-Build:true
Build-Date:2025-08-24 06:43:20

Identification: JOSM/1.5 (19436 SVN en) Windows 11 64-Bit
OS Build number: Windows 10 Pro 23H2 (22631)
Memory Usage: 200 MB / 1888 MB (38 MB allocated, but free)
Java version: 21.0.2+13-LTS, Azul Systems, Inc., OpenJDK 64-Bit Server VM
Look and Feel: com.sun.java.swing.plaf.windows.WindowsLookAndFeel
Screen: \Display0 1920x1080x32bpp@60Hz (scaling 1.00×1.00)
Maximum Screen Size: 1920×1080
Best cursor sizes: 16×16→32×32, 32×32→32×32
System property file.encoding: UTF-8
System property sun.jnu.encoding: Cp1252
Locale info: en_DE
Numbers with default locale: 1234567890 -> 1234567890
VM arguments: [-Djpackage.app-version=1.5.19039, --add-modules=java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web, --add-exports=java.base/sun.security.action=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED, --add-opens=java.base/java.lang=ALL-UNNAMED, --add-opens=java.base/java.nio=ALL-UNNAMED, --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED, --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED, --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED, --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED, --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED, -Djpackage.app-path=%UserProfile%\AppData\Local\JOSM\JOSM HWConsole.exe]
Dataset consistency test: No problems found

Plugins:
+ OpeningHoursEditor (36438)
+ apache-commons (36438)
+ buildings_tools (36438)
+ comfort0 (36438)
+ ejml (36438)
+ geotools (36438)
+ jackson (36438)
+ jaxb (36438)
+ jts (36438)
+ o5m (36438)
+ opendata (36440)
+ pbf (36438)
+ photo_geotagging (36438)
+ poly (36438)
+ reltoolbox (36438)
+ reverter (36447)
+ terracer (36438)
+ undelete (36438)
+ utilsplugin2 (36438)

Tagging presets:
+ c:\josm\core\resources\data\defaultpresets.xml

Map paint styles:
+ c:\josm\core\resources\styles\standard\elemstyles.mapcss

Validator rules:
+ d:\java_tools\JOSM\mygeometry.mapcss
+ https://josm.openstreetmap.de/josmfile?page=Rules/GermanySpecific&zip=1
+ c:\josm\core\resources\data\validator\combinations.mapcss
+ c:\josm\core\resources\data\validator\geometry.mapcss

Last errors/warnings:
- 00000.851 W: extended font config - overriding 'filename.Malgun_Gothic=malgun.ttf' with 'MALGUN.TTF'
- 00000.853 W: extended font config - overriding 'filename.Myanmar_Text=mmrtext.ttf' with 'MMRTEXT.TTF'
- 00000.854 W: extended font config - overriding 'filename.Mongolian_Baiti=monbaiti.ttf' with 'MONBAITI.TTF'
- 00001.599 E: java.security.KeyStoreException: Windows-ROOT not found. Cause: java.security.NoSuchAlgorithmException: Windows-ROOT KeyStore not available

[GerdP]

Please review. It seems to fix the known problems, but the code itself is not very self explaining.

[stoecker]

Let's try this. Revert is always an option later on...

[GerdP]

In 19438/josm:

fix #24444: Too many wrong notifications "Relation modified outside of relation editor with pending changes. Conflict resolution required"

• Don't warn about an "outside modification" if the current relation editor window was used to save / apply changes and thus a change command was generated