Changeset 15906 in josm for trunk

Timestamp:

2020-02-23T00:29:48+01:00 (5 years ago)

Author:

simon04

Message:

Use Utils.hashMapInitialCapacity

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/ParallelWays.java (modified) (2 diffs)
• data/StructUtils.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• tools/ImageResource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -48 +49 @@
         // Make a deep copy of the ways, keeping the copied ways connected
         // TODO: This assumes the first/last nodes of the ways are the only possible shared nodes.
-        Map<Node, Node> splitNodeMap = new HashMap<>(sourceWays.size());
+        Map<Node, Node> splitNodeMap = new HashMap<>(Utils.hashMapInitialCapacity(sourceWays.size()));
         for (Way w : sourceWays) {
             copyNodeInMap(splitNodeMap, w.firstNode(), copyTags);

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

@@ -34 +34 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.ReflectionUtils;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -270 +271 @@
         try (JsonReader reader = Json.createReader(new StringReader(s))) {
             JsonObject object = reader.readObject();
-            ret = new HashMap(object.size());
+            ret = new HashMap(Utils.hashMapInitialCapacity(object.size()));
             for (Map.Entry<String, JsonValue> e: object.entrySet()) {
                 JsonValue value = e.getValue();

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1085 +1085 @@
         protected void deleteTags(int... rows) {
             // convert list of rows to HashMap (and find gap for nextKey)
-            Map<String, String> tags = new HashMap<>(rows.length);
+            Map<String, String> tags = new HashMap<>(Utils.hashMapInitialCapacity(rows.length));
             int nextKeyIndex = rows[0];
             for (int row : rows) {

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

@@ -31 +31 @@
      * Caches the image data for resized versions of the same image.
      */
-    private final Map<Dimension, BufferedImage> imgCache = new HashMap<>();
+    private final Map<Dimension, BufferedImage> imgCache = new HashMap<>(4);
     /**
      * SVG diagram information in case of SVG vector image.