Changeset 19116 in josm for trunk

Timestamp:

2024-06-19T05:42:07+02:00 (5 months ago)

Author:

GerdP

Message:

fix #23648: Not possible to save a layer after marked as "Discourage upload"

• mark layer as changed and show notificaton when the toggle was triggered
• remove overwrite of SaveActionBase.updateEnabledState() for "Save"

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveAction.java (modified) (2 diffs)
• actions/SaveActionBase.java (modified) (2 diffs)
• actions/ToggleUploadDiscouragedLayerAction.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SaveAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
-import org.openstreetmap.josm.gui.layer.SaveToFile;
-import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
@@ -90 +88 @@
 
     @Override
-    protected void updateEnabledState() {
-        Layer activeLayer = getLayerManager().getActiveLayer();
-        boolean en = activeLayer != null
-                && activeLayer.isSavable() && !(activeLayer.getAssociatedFile() != null
-                && activeLayer instanceof SaveToFile && !((SaveToFile) activeLayer).requiresSaveToFile());
-        GuiHelper.runInEDT(() -> setEnabled(en));
-    }
-
-    @Override
     public File getFile(Layer layer) {
         File f = layer.getAssociatedFile();

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.SaveToFile;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
@@ -183 +184 @@
 
     @Override
-    protected void updateEnabledState() {
+    protected final void updateEnabledState() {
         Layer activeLayer = getLayerManager().getActiveLayer();
-        setEnabled(activeLayer != null && activeLayer.isSavable());
+        boolean en = activeLayer != null && activeLayer.isSavable();
+        // see #12669 and #23648
+        if (en && this instanceof SaveAction && activeLayer instanceof SaveToFile) {
+            en = activeLayer.getAssociatedFile() == null || ((SaveToFile) activeLayer).requiresSaveToFile();
+        }
+        setEnabled(en);
     }
 

trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java

@@ -12 +12 @@
 import javax.swing.JCheckBoxMenuItem;
 
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -41 +43 @@
     public void actionPerformed(ActionEvent e) {
         layer.setUploadDiscouraged(!layer.isUploadDiscouraged());
+        String msg = layer.isUploadDiscouraged() ? tr("Upload is discouraged") : tr("Upload is encouraged");
+        GuiHelper.runInEDT(() -> new Notification(msg).show());
         LayerListDialog.getInstance().repaint();
     }

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

@@ -1196 +1196 @@
                 (uploadDiscouraged ^ isUploadDiscouraged())) {
             data.setUploadPolicy(uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL);
+            setRequiresSaveToFile(true);
             for (LayerStateChangeListener l : layerStateChangeListeners) {
                 l.uploadDiscouragedChanged(this, uploadDiscouraged);