Changeset 11008 in josm

Timestamp:

2016-09-17T14:57:33+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13646 - NPE + unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/LayerPositionStrategyTest.java (added)

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

@@ -55 +55 @@
     static LayerPositionStrategy inFrontOfFirst(final Predicate<Layer> what) {
         return manager -> {
-            List<Layer> layers = manager.getLayers();
-            for (int i = 0; i < layers.size(); i++) {
-                if (what.test(layers.get(i))) {
-                    return i;
+            if (manager != null) {
+                List<Layer> layers = manager.getLayers();
+                for (int i = 0; i < layers.size(); i++) {
+                    if (what.test(layers.get(i))) {
+                        return i;
+                    }
                 }
+                return layers.size();
             }
-            return layers.size();
+            return 0;
         };
     }
@@ -72 +75 @@
     static LayerPositionStrategy afterLast(final Predicate<Layer> what) {
         return manager -> {
-            List<Layer> layers = manager.getLayers();
-            for (int i = layers.size() - 1; i >= 0; i--) {
-                if (what.test(layers.get(i))) {
-                    return i + 1;
+            if (manager != null) {
+                List<Layer> layers = manager.getLayers();
+                for (int i = layers.size() - 1; i >= 0; i--) {
+                    if (what.test(layers.get(i))) {
+                        return i + 1;
+                    }
                 }
             }