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

Timestamp:

2020-03-01T23:36:04+01:00 (4 years ago)

Author:

simon04

Message:

see #18802 - Selector: merge GeneralSelector/OptimizedGeneralSelector as there is no difference

• GeneralSelector extended OptimizedGeneralSelector
• GeneralSelector.optimizedBaseCheck returned OptimizedGeneralSelector === this

File:

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

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

@@ -461 +461 @@
             }
             // optimization: filter rules for different primitive types
-            for (MapCSSRule r: rules) {
-                MapCSSRule optRule = new MapCSSRule(r.selector.optimizedBaseCheck(), r.declaration);
-                final String base = r.selector.getBase();
+            for (MapCSSRule optRule: rules) {
+                final String base = optRule.selector.getBase();
                 switch (base) {
                     case Selector.BASE_NODE:
@@ -488 +487 @@
                         break;
                     case Selector.BASE_CANVAS:
-                        canvasRules.add(r);
+                        canvasRules.add(optRule);
                         break;
                     case Selector.BASE_META: