Changeset 16959 in josm for trunk

Timestamp:

2020-08-29T13:33:21+02:00 (4 years ago)

Author:

simon04

Message:

Java 8: use Map.computeIfAbsent

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java

@@ -171 +171 @@
 
     private static class FontDescriptor {
-        public String name;
-        public int style;
-        public int size;
+        final String name;
+        final int style;
+        final int size;
 
         FontDescriptor(String name, int style, int size) {
@@ -199 +199 @@
     private static final Map<FontDescriptor, Font> FONT_MAP = new HashMap<>();
 
-    private static Font getCachedFont(FontDescriptor fd) {
-        Font f = FONT_MAP.get(fd);
-        if (f != null) return f;
-        f = new Font(fd.name, fd.style, fd.size);
-        FONT_MAP.put(fd, f);
-        return f;
-    }
-
     private static Font getCachedFont(String name, int style, int size) {
-        return getCachedFont(new FontDescriptor(name, style, size));
+        return FONT_MAP.computeIfAbsent(new FontDescriptor(name, style, size), fd -> new Font(fd.name, fd.style, fd.size));
     }