Changeset 10599 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-07-23T02:08:50+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1610 - Java 8: Abstract classes without fields should be converted to interfaces

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -318 +318 @@
      *
      * @since 8954
-     */
-    public abstract static class Strategy {
+     * @since 10599 (functional interface)
+     */
+    @FunctionalInterface
+    public interface Strategy {
 
         /**
@@ -327 +329 @@
          * @return the way to keep
          */
-        public abstract Way determineWayToKeep(Iterable<Way> wayChunks);
+        Way determineWayToKeep(Iterable<Way> wayChunks);
 
         /**
@@ -333 +335 @@
          * @return strategy which selects the way chunk with the highest node count to keep
          */
-        public static Strategy keepLongestChunk() {
-            return new Strategy() {
-                @Override
-                public Way determineWayToKeep(Iterable<Way> wayChunks) {
+        static Strategy keepLongestChunk() {
+            return wayChunks -> {
                     Way wayToKeep = null;
                     for (Way i : wayChunks) {
@@ -344 +344 @@
                     }
                     return wayToKeep;
-                }
-            };
+                };
         }
 
@@ -352 +351 @@
          * @return strategy which selects the first way chunk
          */
-        public static Strategy keepFirstChunk() {
-            return new Strategy() {
-                @Override
-                public Way determineWayToKeep(Iterable<Way> wayChunks) {
-                    return wayChunks.iterator().next();
-                }
-            };
+        static Strategy keepFirstChunk() {
+            return wayChunks -> wayChunks.iterator().next();
         }
     }