Changeset 15903 in josm for trunk

Timestamp:

2020-02-22T19:40:27+01:00 (6 years ago)

Author:

simon04

Message:

Projections.getProjectionByCode: use Map.computeIfAbsent

File:

• trunk/src/org/openstreetmap/josm/data/projection/Projections.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -85 +85 @@
     private static final Set<String> allCodes = new HashSet<>();
     private static final Map<String, Supplier<Projection>> projectionSuppliersByCode = new HashMap<>();
-    private static final Map<String, Projection> projectionsByCode_cache = new HashMap<>();
+    private static final Map<String, Projection> projectionsByCodeCache = new HashMap<>();
 
     /*********************************
@@ -361 +361 @@
      */
     public static Projection getProjectionByCode(String code) {
-        Projection proj = projectionsByCode_cache.get(code);
-        if (proj != null) return proj;
-
+        return projectionsByCodeCache.computeIfAbsent(code, Projections::computeProjectionByCode);
+    }
+
+    private static Projection computeProjectionByCode(String code) {
+        Projection proj = null;
         ProjectionDefinition pd = inits.get(code);
         if (pd != null) {
@@ -380 +382 @@
             }
         }
-        if (proj != null) {
-            projectionsByCode_cache.put(code, proj);
-        }
         return proj;
     }