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

Timestamp:

2017-03-09T22:49:28+01:00 (7 years ago)

Author:

bastiK

Message:

fixed #12731 - Add an option to completely prevent upload of a layer : e.g. "never" to upload=true/false

to set this option, add XML attribute upload='never' to .osm file

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ToggleUploadDiscouragedLayerAction.java (modified) (2 diffs)
• UploadAction.java (modified) (1 diff)

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

@@ -32 +32 @@
         super(tr("Discourage upload"), ImageProvider.get("no_upload"));
         this.layer = layer;
+        setEnabled(layer.isUploadable());
     }
 
@@ -43 +44 @@
     public Component createMenuComponent() {
         JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
-        item.setSelected(layer.isUploadDiscouraged());
+        item.setSelected(layer.isUploadDiscouraged() || !layer.isUploadable());
         return item;
     }

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

@@ -141 +141 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getLayerManager().getEditLayer() != null);
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
+        setEnabled(editLayer != null && editLayer.isUploadable());
     }