Changeset 8708 in josm for trunk

Timestamp:

2015-09-01T19:26:57+02:00 (9 years ago)

Author:

simon04

Message:

see #11827 - see #11653 - Revert r8566 till its impacts are fully clarified

Some/many parts of the code rely on org.openstreetmap.josm.data.osm.AbstractPrimitive#getKeys to be modifiable.

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (1 diff)

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

@@ -480 +480 @@
     @Override
     public Map<String, String> getKeys() {
-        final String[] keys = this.keys;
-        if (keys == null || keys.length == 0) {
-            return Collections.emptyMap();
-        } else if (keys.length == 2) {
-            return Collections.singletonMap(keys[0], keys[1]);
-        }
-
-        final Map<String, String> result = new HashMap<>(Utils.hashMapInitialCapacity(keys.length / 2));
-        for (int i = 0; i < keys.length; i += 2) {
-            result.put(keys[i], keys[i + 1]);
-        }
-
+        Map<String, String> result = new HashMap<>(Utils.hashMapInitialCapacity(keys.length / 2));
+        String[] keys = this.keys;
+        if (keys != null) {
+            for (int i = 0; i < keys.length; i += 2) {
+                result.put(keys[i], keys[i + 1]);
+            }
+        }
         return result;
     }