Changeset 10592 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2016-07-22T23:39:36+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, fix #13192 - Update LayerPositionStrategy to be a java 8 functional interface (patch by michael2402, modified) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java (modified) (7 diffs)

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

@@ -3 +3 @@
 
 import java.util.List;
+import java.util.function.Predicate;
 
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Predicates;
 
@@ -11 +11 @@
  * @author Michael Zangl
  * @since 10008
+ * @since 10592 functional interface
  */
-public abstract class LayerPositionStrategy {
+@FunctionalInterface
+public interface LayerPositionStrategy {
 
     /**
      * always inserts at the front of the stack.
      */
-    public static final LayerPositionStrategy IN_FRONT = new LayerPositionStrategy() {
-        @Override
-        public int getPosition(LayerManager manager) {
-            return 0;
-        }
-    };
+    LayerPositionStrategy IN_FRONT = manager -> 0;
 
     /**
      * A GPX layer is added below the lowest data layer.
      */
-    public static final LayerPositionStrategy AFTER_LAST_DATA_LAYER = afterLast(new Predicate<Layer>() {
-        @Override
-        public boolean evaluate(Layer object) {
-            return object instanceof OsmDataLayer || object instanceof ValidatorLayer;
-        }
-    });
+    LayerPositionStrategy AFTER_LAST_DATA_LAYER = afterLast(
+            layer -> layer instanceof OsmDataLayer || layer instanceof ValidatorLayer);
 
     /**
      * A normal layer is added after all validation layers.
      */
-    public static final LayerPositionStrategy AFTER_LAST_VALIDATION_LAYER = afterLast(new Predicate<Layer>() {
-        @Override
-        public boolean evaluate(Layer object) {
-            return object instanceof ValidatorLayer;
-        }
-    });
+    LayerPositionStrategy AFTER_LAST_VALIDATION_LAYER = afterLast(
+            layer -> layer instanceof ValidatorLayer);
 
     /**
@@ -48 +37 @@
      * If there is none, they are added at the end of the list.
      */
-    public static final LayerPositionStrategy BEFORE_FIRST_BACKGROUND_LAYER = inFrontOfFirst(new Predicate<Layer>() {
-        @Override
-        public boolean evaluate(Layer object) {
-            return object.isBackgroundLayer();
-        }
-    });
+    LayerPositionStrategy BEFORE_FIRST_BACKGROUND_LAYER = inFrontOfFirst(
+            layer -> layer.isBackgroundLayer());
 
     /**
@@ -60 +45 @@
      * @return The strategy
      */
-    public static LayerPositionStrategy inFrontOf(Layer other) {
+    static LayerPositionStrategy inFrontOf(Layer other) {
         return inFrontOfFirst(Predicates.equalTo(other));
     }
@@ -69 +54 @@
      * @return The strategy.
      */
-    public static LayerPositionStrategy inFrontOfFirst(final Predicate<Layer> what) {
-        return new LayerPositionStrategy() {
-            @Override
-            public int getPosition(LayerManager manager) {
-                List<Layer> layers = manager.getLayers();
-                for (int i = 0; i < layers.size(); i++) {
-                    if (what.evaluate(layers.get(i))) {
-                        return i;
-                    }
+    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;
                 }
-                return layers.size();
             }
+            return layers.size();
         };
     }
@@ -89 +71 @@
      * @return The strategy.
      */
-    public static LayerPositionStrategy afterLast(final Predicate<Layer> what) {
-        return new LayerPositionStrategy() {
-            @Override
-            public int getPosition(LayerManager manager) {
-                List<Layer> layers = manager.getLayers();
-                for (int i = layers.size() - 1; i >= 0; i--) {
-                    if (what.evaluate(layers.get(i))) {
-                        return i + 1;
-                    }
+    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;
                 }
-                return 0;
             }
+            return 0;
         };
     }
@@ -109 +88 @@
      * @return The position in the range 0...layers.size
      */
-    public abstract int getPosition(LayerManager manager);
+    int getPosition(LayerManager manager);
 }