Changeset 9649 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-01-27T17:02:17+01:00 (8 years ago)

Author:

bastiK

Message:

applied #12355 - add a new TagMap as Set<String, String> (patch by michael2402)

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• AbstractPrimitive.java (modified) (3 diffs)
• OsmPrimitive.java (modified) (1 diff)
• Tag.java (modified) (4 diffs)
• TagMap.java (added)

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

@@ -9 +9 @@
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -391 +390 @@
      */
     @Override
-    public Map<String, String> getKeys() {
-        String[] keys = this.keys;
-        final Map<String, String> result = new HashMap<>(
-                Utils.hashMapInitialCapacity(keys == null ? 0 : keys.length / 2));
-        if (keys != null) {
-            for (int i = 0; i < keys.length; i += 2) {
-                result.put(keys[i], keys[i + 1]);
-            }
-        }
-        return result;
+    public TagMap getKeys() {
+        return new TagMap(keys);
     }
 
@@ -444 +435 @@
         }
         this.keys = newKeys;
+        keysChangedImpl(originalKeys);
+    }
+
+    /**
+     * Copy the keys from a TagMap.
+     * @param keys The new key map.
+     */
+    public void setKeys(TagMap keys) {
+        Map<String, String> originalKeys = getKeys();
+        String[] arr = keys.getTagsArray();
+        if (arr.length == 0) {
+            this.keys = null;
+        } else {
+            this.keys = arr;
+        }
         keysChangedImpl(originalKeys);
     }

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

@@ -919 +919 @@
 
     @Override
+    public final void setKeys(TagMap keys) {
+        boolean locked = writeLock();
+        try {
+            super.setKeys(keys);
+        } finally {
+            writeUnlock(locked);
+        }
+    }
+
+    @Override
     public final void setKeys(Map<String, String> keys) {
         boolean locked = writeLock();

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

@@ -5 +5 @@
 import java.util.Collections;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Objects;
 
@@ -18 +19 @@
  * the modifying methods throw an {@link UnsupportedOperationException}.
  */
-public class Tag implements Tagged {
+public class Tag implements Tagged, Entry<String, String> {
 
     private final String key;
@@ -66 +67 @@
      * @return the key of the tag
      */
+    @Override
     public String getKey() {
         return key;
@@ -75 +77 @@
      * @return the value of the tag
      */
+    @Override
     public String getValue() {
         return value;
+    }
+
+    /**
+     * This is not supported by this implementation.
+     * @param value ignored
+     * @return (Does not return)
+     * @throws UnsupportedOperationException always
+     */
+    @Override
+    public String setValue(String value) {
+        throw new UnsupportedOperationException();
     }