Changeset 8652 in josm for trunk/src/org

Timestamp:

2015-08-09T13:17:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11767 - Use Arrays.copyOf in OsmPrimitive#put(String, String) (patch by michael2402)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• imagery/TemplatedWMSTileSource.java (modified) (1 diff)
• osm/AbstractPrimitive.java (modified) (1 diff)

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

@@ -95 +95 @@
         tileXMax = new int[getMaxZoom() + 1];
         tileYMax = new int[getMaxZoom() + 1];
-        for(int zoom = getMinZoom(); zoom <= getMaxZoom(); zoom++) {
+        for (int zoom = getMinZoom(); zoom <= getMaxZoom(); zoom++) {
             TileXY maxTileIndex = latLonToTileXY(bottomRight.toCoordinate(), zoom);
             tileXMax[zoom] = maxTileIndex.getXIndex();

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

@@ -548 +548 @@
                 }
             }
-            String[] newKeys = new String[keys.length + 2];
-            for (int i = 0; i < keys.length; i += 2) {
-                newKeys[i] = keys[i];
-                newKeys[i+1] = keys[i+1];
-            }
+            String[] newKeys = Arrays.copyOf(keys, keys.length + 2);
             newKeys[keys.length] = key;
             newKeys[keys.length + 1] = value;