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

Timestamp:

2015-09-09T13:03:32+02:00 (9 years ago)

Author:

simon04

Message:

fix #11834 - Use visitor pattern for key/value lookup (patch by michael2402, slightly modified)

File:

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

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

@@ -27 +27 @@
 public abstract class AbstractPrimitive implements IPrimitive {
 
+    /**
+     * This is a visitor that can be used to loop over the keys/values of this primitive.
+     *
+     * @author Michael Zangl
+     * @since 8740
+     */
+    public interface KeyValueVisitor {
+
+        /**
+         * This method gets called for every tag received.
+         *
+         * @param key   The key
+         * @param value The value
+         */
+        void visitKeyValue(String key, String value);
+    }
+
     private static final AtomicLong idCounter = new AtomicLong(0);
 
@@ -477 +494 @@
      * @return tags of this primitive. Changes made in returned map are not mapped
      * back to the primitive, use setKeys() to modify the keys
+     * @see #visitKeys(KeyValueVisitor)
      */
     @Override
@@ -489 +507 @@
         }
         return result;
+    }
+
+    /**
+     * Calls the visitor for every key/value pair of this primitive.
+     *
+     * @param visitor The visitor to call.
+     * @see #getKeys()
+     * @since 8740
+     */
+    public void visitKeys(KeyValueVisitor visitor) {
+        final String[] keys = this.keys;
+        if (keys != null) {
+            for (int i = 0; i < keys.length; i += 2) {
+                visitor.visitKeyValue(keys[i], keys[i + 1]);
+            }
+        }
     }