Changeset 17316 in josm for trunk

Timestamp:

2020-11-16T23:37:05+01:00 (4 years ago)

Author:

Don-vip

Message:

see #7548 - fix #20094 - fix NPE

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -575 +575 @@
     private int computeMaxTabWidth() {
         FontMetrics fm = getFontMetrics(getFont());
-        return settings.stream().filter(x -> x instanceof TabPreferenceSetting)
-                .mapToInt(x -> fm.stringWidth(((TabPreferenceSetting) x).getTitle())).max().orElse(120);
+        return settings.stream().filter(x -> x instanceof TabPreferenceSetting).map(x -> ((TabPreferenceSetting) x).getTitle())
+                .filter(Objects::nonNull).mapToInt(fm::stringWidth).max().orElse(120);
     }