Changeset 9536 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-01-19T10:52:33+01:00 (8 years ago)

Author:

simon04

Message:

Refactoring (make Tag implement the Tagged interface)

File:

• trunk/src/org/openstreetmap/josm/data/osm/Tag.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
 import java.util.Objects;
 
@@ -11 +14 @@
  * be empty, but not null.
  *
+ * <p/>
+ * It implements the {@link Tagged} interface. However, since instances of this class are immutable,
+ * the modifying methods throw an {@link UnsupportedOperationException}.
  */
-public class Tag {
+public class Tag implements Tagged {
 
-    private String key;
-    private String value;
+    private final String key;
+    private final String value;
 
     /**
@@ -131 +137 @@
         return Utils.strip(s).replaceAll("\\s+", " ");
     }
+
+    /**
+     * Unsupported.
+     * @param keys ignored
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void setKeys(Map<String, String> keys) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Map<String, String> getKeys() {
+        return Collections.singletonMap(key, value);
+    }
+
+    /**
+     * Unsupported.
+     * @param key ignored
+     * @param value ignored
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void put(String key, String value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String get(String k) {
+        return key.equals(k) ? value : null;
+    }
+
+    /**
+     * Unsupported.
+     * @param key ignored
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void remove(String key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasKeys() {
+        return true;
+    }
+
+    @Override
+    public Collection<String> keySet() {
+        return Collections.singleton(key);
+    }
+
+    /**
+     * Unsupported.
+     * @throws UnsupportedOperationException
+     */
+    @Override
+    public void removeAll() {
+        throw new UnsupportedOperationException();
+    }
 }