Changeset 17792 in josm for trunk

Timestamp:

2021-04-19T19:03:29+02:00 (3 years ago)

Author:

simon04

Message:

see #20744 - MapCSSTagCheckerAsserts: remove unused code

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerAsserts.java (modified) (6 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -22 +21 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory;
-import org.openstreetmap.josm.gui.mappaint.mapcss.Functions;
 import org.openstreetmap.josm.gui.mappaint.mapcss.LiteralExpression;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
@@ -53 +50 @@
     static void checkAsserts(final MapCSSTagCheckerRule check, final Map<String, Boolean> assertions,
                              final MapCSSTagChecker.AssertionConsumer assertionConsumer) {
-        final Method insideMethod = getFunctionMethod("inside");
         final DataSet ds = new DataSet();
         Logging.debug("Check: {0}", check);
         for (final Map.Entry<String, Boolean> i : assertions.entrySet()) {
             Logging.debug("- Assertion: {0}", i);
-            final OsmPrimitive p = OsmUtils.createPrimitive(i.getKey(), getLocation(check, insideMethod), true);
+            final OsmPrimitive p = OsmUtils.createPrimitive(i.getKey(), getLocation(check), true);
             // Build minimal ordered list of checks to run to test the assertion
             List<Set<MapCSSTagCheckerRule>> checksToRun = new ArrayList<>();
@@ -94 +90 @@
     }
 
-    private static Method getFunctionMethod(String method) {
-        try {
-            return Functions.class.getDeclaredMethod(method, Environment.class, String.class);
-        } catch (NoSuchMethodException | SecurityException e) {
-            Logging.error(e);
-            return null;
-        }
-    }
-
     private static void addPrimitive(DataSet ds, OsmPrimitive p) {
         if (p instanceof Way) {
@@ -112 +99 @@
     }
 
-    private static LatLon getLocation(MapCSSTagCheckerRule check, Method insideMethod) {
-        Optional<String> inside = getFirstInsideCountry(check, insideMethod);
+    private static LatLon getLocation(MapCSSTagCheckerRule check) {
+        Optional<String> inside = getFirstInsideCountry(check);
         if (inside.isPresent()) {
             GeoPropertyIndex<Boolean> index = Territories.getGeoPropertyIndex(inside.get());
@@ -126 +113 @@
     }
 
-    private static Optional<String> getFirstInsideCountry(MapCSSTagCheckerRule check, Method insideMethod) {
+    private static Optional<String> getFirstInsideCountry(MapCSSTagCheckerRule check) {
         return check.rule.selectors.stream()
                 .filter(s -> s instanceof Selector.GeneralSelector)