Not possible to save a layer after marked as "Discourage upload"

[gaben]

What steps will reproduce the problem?

1. Have a new layer with some data
2. Save it
3. Mark it as "Discourage upload"
4. Try to save it again

What is the expected result?

It's possible to save the layer OR the upload attribute automatically propagated to the file without user intervention.

What happens instead?

The save button greyed out. To save the upload=false attribute to the file, I need to make a change to the dataset, then the save button will be available and the attribute will be saved to the file.

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

It was modified during #23506, #23408 and #22817.

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2024-04-27 10:24:46 +0200 (Sat, 27 Apr 2024)
Revision:19064
Build-Date:2024-04-28 01:31:14
URL:https://josm.openstreetmap.de/svn/trunk

[GerdP]

Hit the same problem in the last days.

OR the upload attribute automatically propagated to the file without user intervention.

I wouldn't want that.

[GerdP]

BTW: the save action is still available in the context menu of the layer side window.
Proposed solution:

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1195 +1195 @@
         if (data.getUploadPolicy() != UploadPolicy.BLOCKED &&
                 (uploadDiscouraged ^ isUploadDiscouraged())) {
             data.setUploadPolicy(uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL);
+            setRequiresSaveToFile(true);
             for (LayerStateChangeListener l : layerStateChangeListeners) {
                 l.uploadDiscouragedChanged(this, uploadDiscouraged);
             }