Changeset 10998 in josm for trunk

Timestamp:

2016-09-13T15:07:08+02:00 (8 years ago)

Author:

michael2402

Message:

Make layer remove event fire after the layer has been removed. This fixes #13485. Fixes #13516.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java (modified) (4 diffs)

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

@@ -35 +35 @@
          * Notifies this listener that a layer has been added.
          * <p>
-         * Listeners are called in the EDT thread and you can manipulate the layer manager in the current thread.
+         * Listeners are called in the EDT thread.
          * @param e The new added layer event
          */
@@ -41 +41 @@
 
         /**
-         * Notifies this listener that a layer is about to be removed.
+         * Notifies this listener that a alayer was just removed.
          * <p>
-         * Listeners are called in the EDT thread and you can manipulate the layer manager in the current thread.
+         * Listeners are called in the EDT thread after the layer was removed.
+         * Use {@link LayerRemoveEvent#scheduleRemoval(Collection)} to remove more layers.
          * @param e The layer to be removed (as event)
          */
@@ -223 +224 @@
 
     protected Collection<Layer> realRemoveSingleLayer(Layer layerToRemove) {
-        Collection<Layer> newToRemove = fireLayerRemoving(layerToRemove);
         layers.remove(layerToRemove);
-        return newToRemove;
+        return fireLayerRemoving(layerToRemove);
     }
 
@@ -386 +386 @@
     /**
      * Fire the layer remove event
-     * @param layer The layer to remove
+     * @param layer The layer that was removed
      * @return A list of layers that should be removed afterwards.
      */