Changeset 16794 in josm for trunk

Timestamp:

2020-07-18T07:57:39+02:00 (4 years ago)

Author:

simon04

Message:

fix #19496 - ImageProvider.getPadded: deprioritize multipolygon icon (avoid NPE)

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1600 +1600 @@
         if (primitive.isTagged() && (!options.contains(GetPaddedOptions.NO_WAY_PRESETS) || OsmPrimitiveType.WAY != primitive.getType())) {
             final Optional<ImageIcon> icon = TaggingPresets.getMatchingPresets(primitive).stream()
-                    .sorted(Comparator.comparing(p ->
-                            p.iconName.contains("multipolygon") || p.types == null || p.types.isEmpty() ? Integer.MAX_VALUE : p.types.size()))
+                    .sorted(Comparator.comparing(p -> (p.iconName != null && p.iconName.contains("multipolygon"))
+                            || p.types == null || p.types.isEmpty() ? Integer.MAX_VALUE : p.types.size()))
                     .map(TaggingPreset::getImageResource)
                     .filter(Objects::nonNull)