Changeset 16453 in josm for trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

Timestamp:

2020-05-17T19:53:25+02:00 (6 years ago)

Author:

simon04

Message:

see #19251, see #19252 - fix findFirst/map/orElse sequence

File:

• trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java (modified) (1 diff)

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

@@ -457 +457 @@
             return relation.keySet().stream()
                     .filter(m -> m.endsWith(nameTag))
+                    .findFirst()
                     .map(relation::get)
-                    .findFirst().orElse(null);
+                    .orElse(null);
         } else if (nameTag.startsWith("?") && OsmUtils.isTrue(relation.get(nameTag.substring(1)))) {
             return tr(nameTag.substring(1));