Changeset 15404 in josm for trunk/src/org/openstreetmap/josm/actions/UploadAction.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/UploadAction.java (modified) (7 diffs)

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

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
 import java.util.LinkedList;
 import java.util.List;
@@ -25 +26 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.io.AsynchronousUploadPrimitivesTask;
 import org.openstreetmap.josm.gui.io.UploadDialog;
 import org.openstreetmap.josm.gui.io.UploadPrimitivesTask;
 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
+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.util.GuiHelper;
@@ -41 +45 @@
  * Action that opens a connection to the osm server and uploads all changes.
  *
- * An dialog is displayed asking the user to specify a rectangle to grab.
+ * A dialog is displayed asking the user to specify a rectangle to grab.
  * The url and account settings from the preferences are used.
  *
@@ -91 +95 @@
     }
 
+    private final PropertyChangeListener updateOnRequireUploadChange = evt -> {
+        if (OsmDataLayer.REQUIRES_UPLOAD_TO_SERVER_PROP.equals(evt.getPropertyName())) {
+            updateEnabledState();
+        }
+    };
+
     /**
      * Registers an upload hook. Adds the hook at the first position of the upload hooks.
@@ -146 +156 @@
 
     @Override
+    protected LayerChangeAdapter buildLayerChangeAdapter() {
+        return new LayerChangeAdapter() {
+            @Override
+            public void layerAdded(LayerAddEvent e) {
+                if (e.getAddedLayer() instanceof OsmDataLayer) {
+                    e.getAddedLayer().addPropertyChangeListener(updateOnRequireUploadChange);
+                }
+                super.layerAdded(e);
+            }
+
+            @Override
+            public void layerRemoving(LayerRemoveEvent e) {
+                if (e.getRemovedLayer() instanceof OsmDataLayer) {
+                    e.getRemovedLayer().removePropertyChangeListener(updateOnRequireUploadChange);
+                }
+                super.layerRemoving(e);
+            }
+        };
+    }
+
+    @Override
     protected void updateEnabledState() {
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        setEnabled(editLayer != null && editLayer.isUploadable());
+        setEnabled(editLayer != null && editLayer.requiresUploadToServer());
     }
 
@@ -232 +263 @@
     public void uploadData(final OsmDataLayer layer, APIDataSet apiData) {
         if (apiData.isEmpty()) {
-            JOptionPane.showMessageDialog(
-                    MainApplication.getMainFrame(),
-                    tr("No changes to upload."),
-                    tr("Warning"),
-                    JOptionPane.INFORMATION_MESSAGE
-            );
+            new Notification(tr("No changes to upload.")).show();
             return;
         }
@@ -292 +318 @@
             return;
         if (MainApplication.getMap() == null) {
-            JOptionPane.showMessageDialog(
-                    MainApplication.getMainFrame(),
-                    tr("Nothing to upload. Get some data first."),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE
-            );
+            new Notification(tr("Nothing to upload. Get some data first.")).show();
             return;
         }