Changeset 8740 in josm for trunk

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)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/AbstractPrimitive.java (modified) (3 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (5 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]);
+            }
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -30 +30 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -145 +146 @@
          * @author Michael Zangl
          */
-        private final class RuleCandidatesIterator implements Iterator<MapCSSRule> {
+        private final class RuleCandidatesIterator implements Iterator<MapCSSRule>, KeyValueVisitor {
             private final BitSet ruleCandidates;
             private int next;
@@ -151 +152 @@
             private RuleCandidatesIterator(BitSet ruleCandidates) {
                 this.ruleCandidates = ruleCandidates;
-                next = ruleCandidates.nextSetBit(0);
             }
 
@@ -169 +169 @@
             public void remove() {
                 throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void visitKeyValue(String key, String value) {
+                MapCSSKeyRules v = index.get(key);
+                if (v != null) {
+                    BitSet rs = v.get(value);
+                    ruleCandidates.or(rs);
+                }
+            }
+
+            /**
+             * Call this before using the iterator.
+             */
+            public void prepare() {
+                next = ruleCandidates.nextSetBit(0);
             }
         }
@@ -318 +334 @@
             ruleCandidates.or(remaining);
 
-            for (Map.Entry<String, String> e : osm.getKeys().entrySet()) {
-                MapCSSKeyRules v = index.get(e.getKey());
-                if (v != null) {
-                    BitSet rs = v.get(e.getValue());
-                    ruleCandidates.or(rs);
-                }
-            }
-            return new RuleCandidatesIterator(ruleCandidates);
+            final RuleCandidatesIterator candidatesIterator = new RuleCandidatesIterator(ruleCandidates);
+            osm.visitKeys(candidatesIterator);
+            candidatesIterator.prepare();
+            return candidatesIterator;
         }