Changeset 4074 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

Timestamp:

2011-05-05T20:49:14+02:00 (13 years ago)

Author:

bastiK

Message:

mapcss: performance improvement for parent selector (by Gubaer)

File:

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

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

@@ -134 +134 @@
                 if ((s instanceof GeneralSelector)) {
                     GeneralSelector gs = (GeneralSelector) s;
-                    if (gs.base.equals(type)) {
-                        for (Condition cnd : gs.conds) {
-                            if (!cnd.applies(env))
-                                continue NEXT_RULE;
+                    if (gs.getBase().equals(type)) {
+                        if (!gs.matchesConditions(env)) {
+                            continue NEXT_RULE;
                         }
-                        for (Instruction i : r.declaration) {
-                            i.execute(env);
-                        }
+                        r.execute(env);
                     }
                 }
@@ -179 +176 @@
                                 continue;
                             }
-                            for (Instruction i : r.declaration) {
-                                i.execute(env);
-                            }
+                            r.execute(env);
                         }
                     }
                     env.layer = sub;
-                    for (Instruction i : r.declaration) {
-                        i.execute(env);
-                    }
+                    r.execute(env);
                 }
             }