Changeset 15987 in josm for trunk/src/org/openstreetmap

Timestamp:

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

Author:

simon04

Message:

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

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (5 diffs)
• data/validation/tests/MapCSSTagCheckerIndex.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -54 +54 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource.MapCSSRuleIndex;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
-import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.OptimizedGeneralSelector;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
@@ -453 +453 @@
         /**
          * Determines the {@code index}-th key/value/tag (depending on {@code type}) of the
-         * {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector}.
+         * {@link GeneralSelector}.
          * @param matchingSelector matching selector
          * @param index index
@@ -460 +460 @@
          * @return argument value, can be {@code null}
          */
-        static String determineArgument(OptimizedGeneralSelector matchingSelector, int index, String type, OsmPrimitive p) {
+        static String determineArgument(GeneralSelector matchingSelector, int index, String type, OsmPrimitive p) {
             try {
                 final Condition c = matchingSelector.getConditions().get(index);
@@ -492 +492 @@
             if (s != null && matchingSelector instanceof Selector.ChildOrParentSelector) {
                 return insertArguments(((Selector.ChildOrParentSelector) matchingSelector).right, s, p);
-            } else if (s == null || !(matchingSelector instanceof Selector.OptimizedGeneralSelector)) {
+            } else if (s == null || !(matchingSelector instanceof GeneralSelector)) {
                 return s;
             }
@@ -498 +498 @@
             final StringBuffer sb = new StringBuffer();
             while (m.find()) {
-                final String argument = determineArgument((Selector.OptimizedGeneralSelector) matchingSelector,
+                final String argument = determineArgument((GeneralSelector) matchingSelector,
                         Integer.parseInt(m.group(1)), m.group(2), p);
                 try {

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerIndex.java

@@ -89 +89 @@
                 }
 
-                MapCSSRule optRule = new MapCSSRule(s.optimizedBaseCheck(), c.rule.declaration);
+                MapCSSRule optRule = new MapCSSRule(s, c.rule.declaration);
 
                 ruleToCheckMap.put(optRule, c);

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:

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

@@ -113 +113 @@
 
     String getBase();
-
-    /**
-     * Create an "optimized" copy of this selector that omits the base check.
-     *
-     * For the style source, the list of rules is preprocessed, such that
-     * there is a separate list of rules for nodes, ways, ...
-     *
-     * This means that the base check does not have to be performed
-     * for each rule, but only once for each primitive.
-     *
-     * @return a selector that is identical to this object, except the base of the
-     * "rightmost" selector is not checked
-     */
-    Selector optimizedBaseCheck();
 
     /**
@@ -484 +470 @@
             if (e.osm.getDataSet() == null) {
                 // do nothing
-            } else if (left instanceof OptimizedGeneralSelector) {
-                if (withNodes && ((OptimizedGeneralSelector) left).matchesBase(OsmPrimitiveType.NODE)) {
+            } else if (left instanceof GeneralSelector) {
+                if (withNodes && ((GeneralSelector) left).matchesBase(OsmPrimitiveType.NODE)) {
                     finder.visit(e.osm.getDataSet().searchNodes(e.osm.getBBox()));
                 }
-                if (((OptimizedGeneralSelector) left).matchesBase(OsmPrimitiveType.WAY)) {
+                if (((GeneralSelector) left).matchesBase(OsmPrimitiveType.WAY)) {
                     finder.visit(e.osm.getDataSet().searchWays(e.osm.getBBox()));
                 }
-                if (((OptimizedGeneralSelector) left).matchesBase(OsmPrimitiveType.RELATION)) {
+                if (((GeneralSelector) left).matchesBase(OsmPrimitiveType.RELATION)) {
                     finder.visit(e.osm.getDataSet().searchRelations(e.osm.getBBox()));
                 }
@@ -621 +607 @@
 
         @Override
-        public Selector optimizedBaseCheck() {
-            return new ChildOrParentSelector(left, link, right.optimizedBaseCheck(), type);
-        }
-
-        @Override
         public String toString() {
             return left.toString() + ' ' + (ChildOrParentSelectorType.PARENT == type ? '<' : '>') + link + ' ' + right;
@@ -701 +682 @@
 
         @Override
-        public Selector optimizedBaseCheck() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
         public String toString() {
             return "LinkSelector{conditions=" + conds + '}';
@@ -714 +690 @@
      * General selector. See <a href="https://josm.openstreetmap.de/wiki/Help/Styles/MapCSSImplementation#Selectors">wiki</a>
      */
-    class GeneralSelector extends OptimizedGeneralSelector {
-
-        public GeneralSelector(String base, Range zoom, List<Condition> conds, Subpart subpart) {
-            super(base, zoom, conds, subpart);
-        }
-
-        public boolean matchesConditions(Environment e) {
-            return super.matches(e);
-        }
-
-        @Override
-        public Selector optimizedBaseCheck() {
-            return new OptimizedGeneralSelector(this);
-        }
-
-        @Override
-        public boolean matches(Environment e) {
-            return matchesBase(e) && super.matches(e);
-        }
-    }
-
-    /**
-     * Superclass of {@link GeneralSelector}. Used to create an "optimized" copy of this selector that omits the base check.
-     * @see Selector#optimizedBaseCheck
-     */
-    class OptimizedGeneralSelector extends AbstractSelector {
+    class GeneralSelector extends AbstractSelector {
+
         public final String base;
         public final Range range;
         public final Subpart subpart;
 
-        public OptimizedGeneralSelector(String base, Range range, List<Condition> conds, Subpart subpart) {
+        public GeneralSelector(String base, Range range, List<Condition> conds, Subpart subpart) {
             super(conds);
             this.base = checkBase(base);
@@ -751 +703 @@
         }
 
-        public OptimizedGeneralSelector(GeneralSelector s) {
-            this(s.base, s.range, s.conds, s.subpart);
-        }
-
         @Override
         public Subpart getSubpart() {
@@ -763 +711 @@
         public Range getRange() {
             return range;
+        }
+
+        public boolean matchesConditions(Environment e) {
+            return super.matches(e);
+        }
+
+        @Override
+        public boolean matches(Environment e) {
+            return matchesBase(e) && super.matches(e);
         }
 
@@ -824 +781 @@
         }
 
-        @Override
-        public Selector optimizedBaseCheck() {
-            throw new UnsupportedOperationException();
-        }
-
         public static Range fromLevel(int a, int b) {
             // for input validation in Range constructor below