Changeset 13497 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2018-03-04T15:18:05+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16051, see #8039, see #10456 - more fixes for download/upload policies and locked status (merge of layers)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UpdateModifiedAction.java (modified) (2 diffs)
• UploadSelectionAction.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -46 +47 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getLayerManager().getEditDataSet() != null && !Main.isOffline(OnlineResource.OSM_API));
+        DataSet ds = getLayerManager().getEditDataSet();
+        setEnabled(ds != null && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy())
+                && !Main.isOffline(OnlineResource.OSM_API));
     }
 

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

@@ -64 +64 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         updateEnabledStateOnModifiableSelection(selection);
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
+        if (editLayer != null && !editLayer.isUploadable()) {
+            setEnabled(false);
+        }
     }
 
@@ -89 +93 @@
     public void actionPerformed(ActionEvent e) {
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        if (!isEnabled())
+        if (!isEnabled() || !editLayer.isUploadable())
             return;
         if (editLayer.isUploadDiscouraged() && UploadAction.warnUploadDiscouraged(editLayer)) {
@@ -203 +207 @@
                 hull.add(w);
                 for (Node n: w.getNodes()) {
-                    // we upload modified nodes even if they aren't in the current
-                    // selection.
+                    // we upload modified nodes even if they aren't in the current selection.
                     n.accept(this);
                 }