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

Timestamp:

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

Author:

simon04

Message:

see #18802 - MapCSSStyleIndex: rename/move

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (6 diffs)
• gui/mappaint/mapcss/MapCSSStyleIndex.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerIndex.java ) (5 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)

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

@@ -50 +50 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleIndex;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
@@ -73 +74 @@
  */
 public class MapCSSTagChecker extends Test.TagTest {
-    private MapCSSTagCheckerIndex indexData;
+    private MapCSSStyleIndex indexData;
     final Map<MapCSSRule, MapCSSTagCheckerAndRule> ruleToCheckMap = new HashMap<>();
     private final Set<OsmPrimitive> tested = new HashSet<>();
     private static final Map<IPrimitive, Area> mpAreaCache = new HashMap<>();
+    static final boolean ALL_TESTS = true;
+    static final boolean ONLY_SELECTED_TESTS = false;
 
     /**
@@ -622 +625 @@
     }
 
-    static MapCSSTagCheckerIndex createMapCSSTagCheckerIndex(MultiMap<String, TagCheck> checks, boolean includeOtherSeverity, boolean allTests) {
-        final MapCSSTagCheckerIndex index = new MapCSSTagCheckerIndex();
+    private static boolean hasSameDeclaration(MapCSSRule rule1, final MapCSSRule rule2) {
+        return Objects.equals(rule1.declaration, rule2.declaration);
+    }
+
+    static MapCSSStyleIndex createMapCSSTagCheckerIndex(MultiMap<String, TagCheck> checks, boolean includeOtherSeverity, boolean allTests) {
+        final MapCSSStyleIndex index = new MapCSSStyleIndex();
         final Stream<MapCSSRule> ruleStream = checks.values().stream()
                 .flatMap(Collection::stream)
@@ -643 +650 @@
         final List<TestError> res = new ArrayList<>();
         if (indexData == null) {
-            indexData = MapCSSTagCheckerIndex.createMapCSSTagCheckerIndex(checks, includeOtherSeverity, MapCSSTagCheckerIndex.ALL_TESTS);
+            indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverity, ALL_TESTS);
         }
 
@@ -850 +857 @@
         super.setShowElements(true);
         if (indexData == null) {
-            indexData = MapCSSTagCheckerIndex.createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), MapCSSTagCheckerIndex.ALL_TESTS);
+            indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), ALL_TESTS);
         }
         tested.clear();
@@ -864 +871 @@
             // rebuild index with a reduced set of rules (those that use ChildOrParentSelector) and thus may have left selectors
             // matching the previously tested elements
-            indexData = MapCSSTagCheckerIndex.createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), MapCSSTagCheckerIndex.ONLY_SELECTED_TESTS);
+            indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), ONLY_SELECTED_TESTS);
 
             Set<OsmPrimitive> surrounding = new HashSet<>();

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.validation.tests;
+package org.openstreetmap.josm.gui.mappaint.mapcss;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -17 +15 @@
 import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.validation.Severity;
-import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck;
-import org.openstreetmap.josm.gui.mappaint.mapcss.Declaration;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource.MapCSSRuleIndex;
-import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.MultiMap;
 
 /**
- * Helper class for {@link MapCSSTagChecker} to store indexes of rules
- * @author Gerd
- *
+ * Store indexes of {@link MapCSSRule}s using {@link MapCSSRuleIndex} differentiated by {@linkplain Selector#getBase() base}
  */
-public final class MapCSSTagCheckerIndex {
-    final Map<Declaration, TagCheck> ruleToCheckMap = new HashMap<>();
-
-    static final boolean ALL_TESTS = true;
-    static final boolean ONLY_SELECTED_TESTS = false;
+public final class MapCSSStyleIndex {
 
     /**
@@ -63 +49 @@
     final MapCSSRuleIndex canvasRules = new MapCSSRuleIndex();
 
-    static MapCSSTagCheckerIndex createMapCSSTagCheckerIndex(MultiMap<String, TagCheck> checks, boolean includeOtherSeverity, boolean allTests) {
-        final MapCSSTagCheckerIndex index = new MapCSSTagCheckerIndex();
-        final Stream<MapCSSRule> ruleStream = checks.values().stream()
-                .flatMap(Collection::stream)
-                // Ignore "information" level checks if not wanted, unless they also set a MapCSS class
-                .filter(c -> includeOtherSeverity || Severity.OTHER != c.getSeverity() || !c.setClassExpressions.isEmpty())
-                .filter(c -> allTests || c.rule.selectors.stream().anyMatch(Selector.ChildOrParentSelector.class::isInstance))
-                .peek(c -> index.ruleToCheckMap.put(c.rule.declaration, c))
-                .map(c -> c.rule);
-        index.buildIndex(ruleStream);
-        return index;
-    }
-
     /**
      * Clear the index.
@@ -82 +55 @@
      */
     public void clear() {
-        ruleToCheckMap.clear();
         nodeRules.clear();
         wayRules.clear();
@@ -192 +164 @@
         return get(osm).getRuleCandidates(osm);
     }
-
-    /**
-     * return the TagCheck for which the given indexed rule was created.
-     * @param rule an indexed rule
-     * @return the original TagCheck
-     */
-    public TagCheck getCheck(MapCSSRule rule) {
-        return ruleToCheckMap.get(rule.declaration);
-    }
 }

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

@@ -39 +39 @@
 import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
-import org.openstreetmap.josm.data.validation.tests.MapCSSTagCheckerIndex;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -86 +85 @@
      * Index of rules in this style file
      */
-    private final MapCSSTagCheckerIndex ruleIndex = new MapCSSTagCheckerIndex();
+    private final MapCSSStyleIndex ruleIndex = new MapCSSStyleIndex();
 
     private Color backgroundColorOverride;