Changeset 13133 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-11-19T22:52:24+01:00 (6 years ago)

Author:

bastiK

Message:

applied #8509 - Background uploading (patch by udit, minor changes)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UploadAction.java (modified) (5 diffs)
• gui/io/AsynchronousUploadPrimitivesTask.java (added)
• gui/layer/MainLayerManager.java (modified) (6 diffs)
• gui/layer/OsmDataLayer.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.swing.JOptionPane;
@@ -25 +26 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.io.AsynchronousUploadPrimitivesTask;
 import org.openstreetmap.josm.gui.io.UploadDialog;
 import org.openstreetmap.josm.gui.io.UploadPrimitivesTask;
@@ -30 +32 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -58 +61 @@
     private static final List<UploadHook> LATE_UPLOAD_HOOKS = new LinkedList<>();
 
+    private static final String IS_ASYNC_UPLOAD_ENABLED = "asynchronous.upload";
+
     static {
         /**
@@ -260 +265 @@
         }
 
-        MainApplication.worker.execute(
-                new UploadPrimitivesTask(
-                        UploadDialog.getUploadDialog().getUploadStrategySpecification(),
-                        layer,
-                        apiData,
-                        cs
-                )
-        );
+        if (Config.getPref().getBoolean(IS_ASYNC_UPLOAD_ENABLED, true)) {
+            Optional<AsynchronousUploadPrimitivesTask> asyncUploadTask = AsynchronousUploadPrimitivesTask.createAsynchronousUploadTask(
+                    UploadDialog.getUploadDialog().getUploadStrategySpecification(),
+                    layer,
+                    apiData,
+                    cs);
+
+            if (asyncUploadTask.isPresent()) {
+                MainApplication.worker.execute(asyncUploadTask.get());
+            }
+        } else {
+            MainApplication.worker.execute(
+                    new UploadPrimitivesTask(
+                            UploadDialog.getUploadDialog().getUploadStrategySpecification(),
+                            layer,
+                            apiData,
+                            cs));
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -8 +10 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -206 +211 @@
 
     /**
-     * Set the active layer. If the layer is an OsmDataLayer, the edit layer is also changed.
+     * Set the active layer, unless the layer is read-only.
+     * If the layer is an OsmDataLayer, the edit layer is also changed.
      * @param layer The active layer.
      */
@@ -212 +218 @@
         // we force this on to the EDT Thread to make events fire from there.
         // The synchronization lock needs to be held by the EDT.
-        GuiHelper.runInEDTAndWaitWithException(() -> realSetActiveLayer(layer));
+        if (layer instanceof OsmDataLayer && ((OsmDataLayer) layer).isReadOnly()) {
+            GuiHelper.runInEDT(() ->
+                    JOptionPane.showMessageDialog(
+                            MainApplication.parent,
+                            tr("Trying to set a read only data layer as edit layer"),
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE));
+        } else {
+            GuiHelper.runInEDTAndWaitWithException(() -> realSetActiveLayer(layer));
+        }
     }
 
@@ -310 +325 @@
      */
     public synchronized Layer getActiveLayer() {
-        return activeLayer;
-    }
-
-    /**
-     * Replies the current edit layer, if any
+        if (activeLayer instanceof OsmDataLayer) {
+            if (!((OsmDataLayer) activeLayer).isReadOnly()) {
+                return activeLayer;
+            } else {
+                return null;
+            }
+        } else {
+            return activeLayer;
+        }
+    }
+
+    /**
+     * Replies the current edit layer, if present and not readOnly
      *
      * @return the current edit layer. May be null.
      */
     public synchronized OsmDataLayer getEditLayer() {
-        return editLayer;
+        if (editLayer != null && !editLayer.isReadOnly())
+            return editLayer;
+        else
+            return null;
     }
 
@@ -379 +405 @@
         layerAvailabilityListeners.clear();
     }
+
+    /**
+     * Prepares an OsmDataLayer for upload. The layer to be uploaded is locked and
+     * if the layer to be uploaded is the current editLayer then editLayer is reset
+     * to null for disallowing any changes to the layer. An ActiveLayerChangeEvent
+     * is fired to notify the listeners
+     *
+     * @param layer The OsmDataLayer to be uploaded
+     */
+    public void prepareLayerForUpload(OsmDataLayer layer) {
+
+        GuiHelper.assertCallFromEdt();
+        layer.setReadOnly();
+
+        // Reset only the edit layer as empty
+        if (editLayer == layer) {
+            ActiveLayerChangeEvent activeLayerChangeEvent = new ActiveLayerChangeEvent(this, editLayer, activeLayer);
+            editLayer = null;
+            fireActiveLayerChange(activeLayerChangeEvent);
+        }
+    }
+
+    /**
+     * Post upload processing of the OsmDataLayer.
+     * If the current edit layer is empty this function sets the layer uploaded as the
+     * current editLayer. An ActiveLayerChangeEvent is fired to notify the listeners
+     *
+     * @param layer The OsmDataLayer uploaded
+     */
+    public void processLayerAfterUpload(OsmDataLayer layer) {
+        GuiHelper.assertCallFromEdt();
+        layer.unsetReadOnly();
+
+        // Set the layer as edit layer if the edit layer is empty.
+        if (editLayer == null) {
+            ActiveLayerChangeEvent layerChangeEvent = new ActiveLayerChangeEvent(this, editLayer, activeLayer);
+            editLayer = layer;
+            fireActiveLayerChange(layerChangeEvent);
+        }
+    }
 }

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

@@ -32 +32 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
@@ -130 +131 @@
     private boolean requiresSaveToFile;
     private boolean requiresUploadToServer;
+    /** Flag used to know if the layer should not be editable */
+    private final AtomicBoolean isReadOnly = new AtomicBoolean(false);
 
     /**
@@ -421 +424 @@
             base.addOverlay(new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0));
         }
+
+        if (isReadOnly()) {
+            // If the layer is read only then change the default icon to a clock
+            base = new ImageProvider("clock").setMaxSize(ImageSizes.LAYER);
+        }
         return base.get();
     }
@@ -1144 +1152 @@
         super.setName(name);
     }
+
+    /**
+     * Sets the isReadOnly flag for the OsmDataLayer as true
+     */
+    public void setReadOnly() {
+        if (!isReadOnly.compareAndSet(false, true)) {
+            Logging.warn("Trying to set readOnly flag on a readOnly layer ", this.getName());
+        }
+    }
+
+    /**
+     * Sets the isReadOnly flag for the OsmDataLayer as false
+     */
+    public void unsetReadOnly() {
+        if (!isReadOnly.compareAndSet(true, false)) {
+            Logging.warn("Trying to unset readOnly flag on a non-readOnly layer ", this.getName());
+        }
+    }
+
+    /**
+     * Returns the value of the isReadOnly flag for the OsmDataLayer
+     * @return isReadOnly
+     */
+    public boolean isReadOnly() {
+        return isReadOnly.get();
+    }
 }