Changeset 10507 in josm for trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

Timestamp:

2016-07-03T11:49:45+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13095 - Exception on closing layers (patch by michael2402) - gsoc-core

File:

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

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.ListIterator;
@@ -207 +208 @@
 
     @Override
-    protected synchronized void realRemoveLayer(Layer layer) {
+    protected Collection<Layer> realRemoveSingleLayer(Layer layer) {
         if (layer == activeLayer || layer == editLayer) {
             Layer nextActive = suggestNextActiveLayer(layer);
@@ -213 +214 @@
         }
 
-        super.realRemoveLayer(layer);
+        return super.realRemoveSingleLayer(layer);
     }