Changeset 11097 in josm

Timestamp:

2016-10-08T02:45:48+02:00 (8 years ago)

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/TagCollection.java (modified) (3 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (1 diff)
• gui/layer/CustomizeColor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -535 +535 @@
      */
     public Set<String> getValues() {
-        return tags.keySet().stream().map(e -> e.getValue()).collect(Collectors.toSet());
+        return tags.keySet().stream().map(Tag::getValue).collect(Collectors.toSet());
     }
 
@@ -548 +548 @@
     public Set<String> getValues(String key) {
         // null-safe
-        return generateStreamForKey(key).map(e -> e.getValue()).collect(Collectors.toSet());
+        return generateStreamForKey(key).map(Tag::getValue).collect(Collectors.toSet());
     }
 
@@ -737 +737 @@
 
     private Stream<String> generateKeyStream() {
-        return tags.keySet().stream().map(tag -> tag.getKey());
+        return tags.keySet().stream().map(Tag::getKey);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -180 +180 @@
         Map<Severity, Map<String, Map<String, List<TestError>>>> errorTreeDeep
             = errors.stream().filter(filterToUse).collect(
-                    Collectors.groupingBy(e -> e.getSeverity(), () -> new EnumMap<>(Severity.class),
+                    Collectors.groupingBy(TestError::getSeverity, () -> new EnumMap<>(Severity.class),
                             Collectors.groupingBy(e -> e.getDescription() == null ? "" : e.getDescription(),
-                                    Collectors.groupingBy(e -> e.getMessage()))));
+                                    Collectors.groupingBy(TestError::getMessage))));
 
         List<TreePath> expandedPaths = new ArrayList<>();

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

@@ -66 +66 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Color cl = colors.stream().map(c -> c.get()).filter(Objects::nonNull).findAny().orElse(Color.GRAY);
+        Color cl = colors.stream().map(AbstractProperty::get).filter(Objects::nonNull).findAny().orElse(Color.GRAY);
         JColorChooser c = new JColorChooser(cl);
         Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")};