Ticket #12731: 12731-upload-block.patch

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

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

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

@@ -140 +140 @@
      */
     @Override
     protected void updateEnabledState() {
-        setEnabled(getLayerManager().getEditLayer() != null);
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
+        setEnabled(editLayer != null && editLayer.isUploadable());
     }
 
     public static boolean checkPreUploadConditions(AbstractModifiableLayer layer) {

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -98 +98 @@
  */
 public final class DataSet implements Data, ProjectionChangeListener {
 
+    public enum UploadPolicy { 
+        NORMAL("true"),
+        DISCOURAGED("false"),
+        BLOCKED("never");
+
+        String xml_flag;
+
+        private UploadPolicy(String xml_flag) {
+            this.xml_flag = xml_flag;
+        }
+
+        public String getXmlFlag() {
+            return xml_flag;
+        }
+    };
+
     /**
      * Maximum number of events that can be fired between beginUpdate/endUpdate to be send as single events (ie without DatasetChangedEvent)
      */
@@ -123 +139 @@
 
     private int highlightUpdateCount;
 
-    private boolean uploadDiscouraged;
+    private UploadPolicy uploadPolicy;
 
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
     private final Object selectionLock = new Object();
@@ -299 +315 @@
     }
 
     /**
-     * Determines if upload is being discouraged (i.e. this dataset contains private data which should not be uploaded)
+     * Determines if upload is being discouraged.
+     * (i.e. this dataset contains private data which should not be uploaded)
      * @return {@code true} if upload is being discouraged, {@code false} otherwise
      * @see #setUploadDiscouraged
      */
+    @Deprecated
     public boolean isUploadDiscouraged() {
-        return uploadDiscouraged;
+        return uploadPolicy == UploadPolicy.DISCOURAGED || uploadPolicy == UploadPolicy.BLOCKED;
     }
 
     /**
@@ -312 +330 @@
      * @param uploadDiscouraged {@code true} if this dataset contains private data which should not be uploaded
      * @see #isUploadDiscouraged
      */
+    @Deprecated
     public void setUploadDiscouraged(boolean uploadDiscouraged) {
-        this.uploadDiscouraged = uploadDiscouraged;
+        if (uploadPolicy != UploadPolicy.BLOCKED) {
+            this.uploadPolicy = uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL;
+        }
     }
 
+    public UploadPolicy getUploadPolicy() {
+        return this.uploadPolicy;
+    }
+
+    public void setUploadPolicy(UploadPolicy uploadPolicy) {
+        this.uploadPolicy = uploadPolicy;
+    }
+
     /**
      * Holding bin for changeset tag information, to be applied when or if this is ever uploaded.
      */

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

@@ -62 +62 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.DataIntegrityProblemException;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -386 +387 @@
     @Override
     public Icon getIcon() {
         ImageProvider base = getBaseIconProvider().setMaxSize(ImageSizes.LAYER);
-        if (isUploadDiscouraged()) {
+        if (isUploadDiscouraged() || data.getUploadPolicy() == UploadPolicy.BLOCKED) {
             base.addOverlay(new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0));
         }
         return base.get();
@@ -603 +604 @@
         if (isUploadDiscouraged()) {
             p.add(new JLabel(tr("Upload is discouraged")), GBC.eop().insets(15, 0, 0, 0));
         }
+        if (data.getUploadPolicy() == UploadPolicy.BLOCKED) {
+            p.add(new JLabel(tr("Upload is blocked")), GBC.eop().insets(15, 0, 0, 0));
+        }
 
         return p;
     }
@@ -873 +877 @@
 
     @Override
     public boolean isUploadable() {
-        return true;
+        return data.getUploadPolicy() != UploadPolicy.BLOCKED;
     }
 
     @Override
     public boolean requiresUploadToServer() {
-        return requiresUploadToServer;
+        return isUploadable() && requiresUploadToServer;
     }
 
     @Override
@@ -967 +971 @@
          // change listener and already got notified.
     }
 
+    /**
+     * Determines if upload is being discouraged.
+     * (i.e. this dataset contains private data which should not be uploaded)
+     * @return {@code true} if upload is being discouraged, {@code false} otherwise
+     */
     @Override
     public final boolean isUploadDiscouraged() {
-        return data.isUploadDiscouraged();
+        return data.getUploadPolicy() == UploadPolicy.DISCOURAGED;
     }
 
     /**
@@ -978 +987 @@
      * This feature allows to use "private" data layers.
      */
     public final void setUploadDiscouraged(boolean uploadDiscouraged) {
-        if (uploadDiscouraged ^ isUploadDiscouraged()) {
-            data.setUploadDiscouraged(uploadDiscouraged);
+        if (data.getUploadPolicy() != UploadPolicy.BLOCKED &&
+                uploadDiscouraged ^ isUploadDiscouraged()) {
+            data.setUploadPolicy(uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL);
             for (LayerStateChangeListener l : layerStateChangeListeners) {
                 l.uploadDiscouragedChanged(this, uploadDiscouraged);
             }

src/org/openstreetmap/josm/io/OsmReader.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -138 +139 @@
         ds.setVersion(v);
         String upload = parser.getAttributeValue(null, "upload");
         if (upload != null) {
-            ds.setUploadDiscouraged(!Boolean.parseBoolean(upload));
+            for (UploadPolicy policy : UploadPolicy.values()) {
+                if (policy.getXmlFlag().equalsIgnoreCase(upload)) {
+                    ds.setUploadPolicy(policy);
+                    break;
+                }
+            }
         }
         String generator = parser.getAttributeValue(null, "generator");
         Long uploadChangesetId = null;

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.IRelation;
@@ -77 +78 @@
         header(null);
     }
 
-    public void header(Boolean upload) {
+    public void header(UploadPolicy upload) {
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
         out.print("<osm version='");
         out.print(version);
-        if (upload != null) {
+        if (upload != UploadPolicy.NORMAL) {
             out.print("' upload='");
-            out.print(upload);
+            out.print(upload.getXmlFlag());
         }
         out.println("' generator='JOSM'>");
     }
@@ -113 +114 @@
     }
 
     public void writeLayer(OsmDataLayer layer) {
-        header(!layer.isUploadDiscouraged());
+        header(layer.data.getUploadPolicy());
         writeDataSources(layer.data);
         writeContent(layer.data);
         footer();

src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

@@ -156 +156 @@
         try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
              OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, ds.getVersion())
             ) {
-            w.header(Boolean.FALSE);
+            w.header(DataSet.UploadPolicy.DISCOURAGED);
             w.writeContent(ds);
             w.footer();
         } catch (IOException ex) {