Changeset 12865 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-09-15T01:20:41+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11390 - SonarQube - squid:S3824 - "Map.get" and value test should be replaced with single method call

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• APIDataSet.java (modified) (1 diff)
• Preferences.java (modified) (3 diffs)
• cache/CacheEntryAttributes.java (modified) (1 diff)
• cache/HostLimitQueue.java (modified) (1 diff)
• imagery/TMSCachedTileLoaderJob.java (modified) (1 diff)
• osm/User.java (modified) (1 diff)
• osm/history/HistoryDataSet.java (modified) (1 diff)
• validation/tests/CrossingWays.java (modified) (1 diff)
• validation/tests/RelationChecker.java (modified) (1 diff)
• validation/util/ValUtil.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -282 +282 @@
 
         public Set<Relation> getChildren(Relation relation) {
-            Set<Relation> p = children.get(relation);
-            if (p == null) {
-                p = new HashSet<>();
-                children.put(relation, p);
-            }
-            return p;
+            return children.computeIfAbsent(relation, k -> new HashSet<>());
         }
 

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -47 +47 @@
 import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
-import org.openstreetmap.josm.spi.preferences.IPreferences;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.ListListSetting;
@@ -63 +62 @@
 import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
 import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
+import org.openstreetmap.josm.spi.preferences.IPreferences;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -282 +282 @@
 
     private ListenerList<PreferenceChangedListener> listenersForKey(String key) {
-        ListenerList<PreferenceChangedListener> keyListener = keyListeners.get(key);
-        if (keyListener == null) {
-            keyListener = ListenerList.create();
-            keyListeners.put(key, keyListener);
-        }
-        return keyListener;
+        return keyListeners.computeIfAbsent(key, k -> ListenerList.create());
     }
 

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -89 +89 @@
      */
     private long getLongAttr(String key) {
-        String val = attrs.get(key);
-        if (val == null) {
-            attrs.put(key, "0");
-            return 0;
-        }
         try {
-            return Long.parseLong(val);
+            return Long.parseLong(attrs.computeIfAbsent(key, k -> "0"));
         } catch (NumberFormatException e) {
             attrs.put(key, "0");

trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java

@@ -159 +159 @@
         if (limit == null) {
             synchronized (hostSemaphores) {
-                limit = hostSemaphores.get(host);
-                if (limit == null) {
-                    limit = new Semaphore(hostLimit);
-                    hostSemaphores.put(host, limit);
-                }
+                limit = hostSemaphores.computeIfAbsent(host, k -> new Semaphore(hostLimit));
             }
         }

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -68 +68 @@
             String deduplicationKey = getCacheKey();
             synchronized (inProgress) {
-                Set<TileLoaderListener> newListeners = inProgress.get(deduplicationKey);
-                if (newListeners == null) {
-                    newListeners = new HashSet<>();
-                    inProgress.put(deduplicationKey, newListeners);
-                }
-                newListeners.add(listener);
+                inProgress.computeIfAbsent(deduplicationKey, k -> new HashSet<>()).add(listener);
             }
         }

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

@@ -74 +74 @@
         }
 
-        Long ouid = uid;
-        User user = userMap.get(ouid);
-        if (user == null) {
-            user = new User(uid, name);
-            userMap.put(ouid, user);
-        }
+        User user = userMap.computeIfAbsent(uid, k -> new User(uid, name));
         if (name != null) user.addName(name);
 

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -125 +125 @@
     public void put(HistoryOsmPrimitive primitive) {
         PrimitiveId id = new SimplePrimitiveId(primitive.getId(), primitive.getType());
-        if (data.get(id) == null) {
-            data.put(id, new ArrayList<HistoryOsmPrimitive>());
-        }
-        data.get(id).add(primitive);
+        data.computeIfAbsent(id, k-> new ArrayList<>()).add(primitive);
         fireHistoryUpdated(id);
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -315 +315 @@
      */
     public static List<List<WaySegment>> getSegments(Map<Point2D, List<WaySegment>> cellSegments, EastNorth n1, EastNorth n2) {
-
         List<List<WaySegment>> cells = new ArrayList<>();
         for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.getGridDetail())) {
-            List<WaySegment> segments = cellSegments.get(cell);
-            if (segments == null) {
-                segments = new ArrayList<>();
-                cellSegments.put(cell, segments);
-            }
-            cells.add(segments);
+            cells.add(cellSegments.computeIfAbsent(cell, k -> new ArrayList<>()));
         }
         return cells;

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -129 +129 @@
         Map<String, RoleInfo> map = new HashMap<>();
         for (RelationMember m : n.getMembers()) {
-            String role = m.getRole();
-            RoleInfo ri = map.get(role);
-            if (ri == null) {
-                ri = new RoleInfo();
-                map.put(role, ri);
-            }
-            ri.total++;
+            map.computeIfAbsent(m.getRole(), k -> new RoleInfo()).total++;
         }
         return map;

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -56 +56 @@
         cell = new Point2D.Double(x0, y0);
         cellNodes.add(cell);
-        List<Way> ways = cellWays.get(cell);
-        if (ways == null) {
-            ways = new ArrayList<>();
-            cellWays.put(cell, ways);
-        }
-        cells.add(ways);
+        cells.add(cellWays.computeIfAbsent(cell, k -> new ArrayList<>()));
 
         // End of the way
@@ -67 +62 @@
         if (!cellNodes.contains(cell)) {
             cellNodes.add(cell);
-            ways = cellWays.get(cell);
-            if (ways == null) {
-                ways = new ArrayList<>();
-                cellWays.put(cell, ways);
-            }
-            cells.add(ways);
+            cells.add(cellWays.computeIfAbsent(cell, k -> new ArrayList<>()));
         }
 
@@ -87 +77 @@
         if (!cellNodes.contains(cell)) {
             cellNodes.add(cell);
-            ways = cellWays.get(cell);
-            if (ways == null) {
-                ways = new ArrayList<>();
-                cellWays.put(cell, ways);
-            }
-            cells.add(ways);
+            cells.add(cellWays.computeIfAbsent(cell, k -> new ArrayList<>()));
         }
 
@@ -99 +84 @@
         if (!cellNodes.contains(cell)) {
             cellNodes.add(cell);
-            ways = cellWays.get(cell);
-            if (ways == null) {
-                ways = new ArrayList<>();
-                cellWays.put(cell, ways);
-            }
-            cells.add(ways);
+            cells.add(cellWays.computeIfAbsent(cell, k -> new ArrayList<>()));
         }
         return cells;