Changeset 13213 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-12-17T20:36:48+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15653, see #8509 - IllegalStateException during Upload (regression from r13133 - patch by udit, minor changes)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (modified) (3 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.io.AsynchronousUploadPrimitivesTask;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -274 +275 @@
     @Override
     protected Collection<Layer> realRemoveSingleLayer(Layer layer) {
+        if ((layer instanceof OsmDataLayer) && (((OsmDataLayer) layer).isReadOnly())) {
+            GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(MainApplication.parent,
+                    tr("Trying to delete the layer with background upload. Please wait until the upload is finished.")));
+
+            // Return an empty collection for allowing to delete other layers
+            return new ArrayList<>();
+        }
+
         if (layer == activeLayer || layer == editLayer) {
             Layer nextActive = suggestNextActiveLayer(layer);
@@ -409 +418 @@
     @Override
     protected synchronized void realResetState() {
-        // active and edit layer are unset automatically
-        super.realResetState();
-
-        activeLayerChangeListeners.clear();
-        layerAvailabilityListeners.clear();
+        // Reset state if no asynchronous upload is under progress
+        if (!AsynchronousUploadPrimitivesTask.getCurrentAsynchronousUploadTask().isPresent()) {
+            // active and edit layer are unset automatically
+            super.realResetState();
+
+            activeLayerChangeListeners.clear();
+            layerAvailabilityListeners.clear();
+        } else {
+            GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(MainApplication.parent,
+                    tr("A background upload is already in progress. Cannot reset state until the upload is finished.")));
+        }
     }