Changeset 10882 in josm for trunk

Timestamp:

2016-08-23T23:34:58+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13396 - improve performance in Renderer (patch by Gerd Petermann, modified to remove code duplication, using Java 8 int functions)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.function.IntFunction;
+import java.util.function.IntSupplier;
 import java.util.regex.PatternSyntaxException;
 
@@ -142 +144 @@
             }
 
+            private <T extends OsmPrimitive> void doVisit(T parent, IntSupplier counter, IntFunction<OsmPrimitive> getter) {
+                // If e.parent is already set to the first matching referrer.
+                // We skip any following referrer injected into the visitor.
+                if (e.parent != null) return;
+
+                if (!left.matches(e.withPrimitive(parent)))
+                    return;
+                int count = counter.getAsInt();
+                if (link.conds == null) {
+                    // index is not needed, we can avoid the sequential search below
+                    e.parent = parent;
+                    e.count = count;
+                    return;
+                }
+                for (int i = 0; i < count; i++) {
+                    if (getter.apply(i).equals(e.osm) && link.matches(e.withParentAndIndexAndLinkContext(parent, i, count))) {
+                        e.parent = parent;
+                        e.index = i;
+                        e.count = count;
+                        return;
+                    }
+                }
+            }
+
             @Override
             public void visit(Way w) {
-                /*
-                 * If e.parent is already set to the first matching referrer. We skip any following
-                 * referrer injected into the visitor.
-                 */
-                if (e.parent != null) return;
-
-                if (!left.matches(e.withPrimitive(w)))
-                    return;
-                for (int i = 0; i < w.getNodesCount(); i++) {
-                    Node n = w.getNode(i);
-                    if (n.equals(e.osm)) {
-                        if (link.matches(e.withParentAndIndexAndLinkContext(w, i, w.getNodesCount()))) {
-                            e.parent = w;
-                            e.index = i;
-                            e.count = w.getNodesCount();
-                            return;
-                        }
-                    }
-                }
+                doVisit(w, w::getNodesCount, w::getNode);
             }
 
             @Override
             public void visit(Relation r) {
-                /*
-                 * If e.parent is already set to the first matching referrer. We skip any following
-                 * referrer injected into the visitor.
-                 */
-                if (e.parent != null) return;
-
-                if (!left.matches(e.withPrimitive(r)))
-                    return;
-                for (int i = 0; i < r.getMembersCount(); i++) {
-                    RelationMember m = r.getMember(i);
-                    if (m.getMember().equals(e.osm)) {
-                        if (link.matches(e.withParentAndIndexAndLinkContext(r, i, r.getMembersCount()))) {
-                            e.parent = r;
-                            e.index = i;
-                            e.count = r.getMembersCount();
-                            return;
-                        }
-                    }
-                }
+                doVisit(r, r::getMembersCount, i -> r.getMember(i).getMember());
             }
         }