Changeset 15404 in josm for trunk/src/org/openstreetmap/josm/actions/SaveAction.java

Timestamp:

2019-10-02T23:11:24+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #12669 - Disable upload and save buttons when not needed

File:

• trunk/src/org/openstreetmap/josm/actions/SaveAction.java (modified) (4 diffs)

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

@@ -6 +6 @@
 
 import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
 import java.io.File;
 
@@ -12 +13 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.SaveToFile;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -21 +26 @@
 public final class SaveAction extends SaveActionBase {
     private static SaveAction instance = new SaveAction();
+
+    private final PropertyChangeListener updateOnRequireSaveChange = evt -> {
+        if (OsmDataLayer.REQUIRES_SAVE_TO_DISK_PROP.equals(evt.getPropertyName())) {
+            updateEnabledState();
+        }
+    };
 
     /**
@@ -39 +50 @@
     }
 
-    @Override public File getFile(Layer layer) {
+    @Override
+    protected LayerChangeAdapter buildLayerChangeAdapter() {
+        return new LayerChangeAdapter() {
+            @Override
+            public void layerAdded(LayerAddEvent e) {
+                if (e.getAddedLayer() instanceof OsmDataLayer) {
+                    e.getAddedLayer().addPropertyChangeListener(updateOnRequireSaveChange);
+                }
+                super.layerAdded(e);
+            }
+
+            @Override
+            public void layerRemoving(LayerRemoveEvent e) {
+                if (e.getRemovedLayer() instanceof OsmDataLayer) {
+                    e.getRemovedLayer().removePropertyChangeListener(updateOnRequireSaveChange);
+                }
+                super.layerRemoving(e);
+            }
+        };
+    }
+
+    @Override
+    protected void updateEnabledState() {
+        Layer activeLayer = getLayerManager().getActiveLayer();
+        setEnabled(activeLayer != null && activeLayer.isSavable()
+                && (!(activeLayer.getAssociatedFile() != null
+                    && activeLayer instanceof SaveToFile && !((SaveToFile) activeLayer).requiresSaveToFile())));
+    }
+
+    @Override
+    public File getFile(Layer layer) {
         File f = layer.getAssociatedFile();
         if (f != null && !f.exists()) {