Changeset 12901 in josm for trunk/src/org

Timestamp:

2017-09-26T02:25:00+02:00 (7 years ago)

Author:

Don-vip

Message:

SonarQube - squid:S1612 - Lambdas should be replaced with method references

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SplitWayAction.java (modified) (1 diff)
• command/SplitWayCommand.java (modified) (1 diff)
• data/tagging/ac/AutoCompletionSet.java (modified) (2 diffs)

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

@@ -503 +503 @@
     public static SplitWayResult splitWay(Way way, List<List<Node>> wayChunks,
             Collection<? extends OsmPrimitive> selection, Strategy splitStrategy) {
-        SplitWayCommand cmd = SplitWayCommand.splitWay(way, wayChunks, selection, x -> splitStrategy.determineWayToKeep(x));
+        SplitWayCommand cmd = SplitWayCommand.splitWay(way, wayChunks, selection, splitStrategy::determineWayToKeep);
         return cmd != null ? new SplitWayResult(cmd) : null;
     }

trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

@@ -38 +38 @@
 public class SplitWayCommand extends SequenceCommand {
 
-    private static volatile Consumer<String> warningNotifier = msg -> Logging.warn(msg);
+    private static volatile Consumer<String> warningNotifier = Logging::warn;
 
     /**

trunk/src/org/openstreetmap/josm/data/tagging/ac/AutoCompletionSet.java

@@ -3 +3 @@
 
 import java.util.Collection;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.TreeSet;
@@ -47 +48 @@
      */
     public boolean addAll(Collection<String> values, AutoCompletionPriority priority) {
-        return addAll(values.stream().filter(v -> v != null).map(v -> new AutoCompletionItem(v, priority)).collect(Collectors.toList()));
+        return addAll(values.stream().filter(Objects::nonNull).map(v -> new AutoCompletionItem(v, priority)).collect(Collectors.toList()));
     }