Changeset 8741 in josm

Timestamp:

2015-09-10T08:45:02+02:00 (9 years ago)

Author:

simon04

Message:

fix #11846 - MapCSS validator: make ignoring "Whole group" work again

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Subpart.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (2 diffs)

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

@@ -656 +656 @@
         public String toString() {
             return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + Utils.join("", conds)
-                    + (subpart != null ? "::" + subpart : "");
+                    + (subpart != null && subpart != Subpart.DEFAULT_SUBPART ? "::" + subpart : "");
         }
     }

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

@@ -29 +29 @@
             return id;
         }
+
+        @Override
+        public String toString() {
+            return id;
+        }
     }
 
@@ -47 +52 @@
             return Cascade.convertTo(id.evaluate(env), String.class);
         }
+
+        @Override
+        public String toString() {
+            return String.valueOf(id);
+        }
     }
 }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -106 +106 @@
         assertThat(errors.size(), is(1));
         assertThat(errors.iterator().next().getMessage(), is("has alt_name but not name"));
+        assertThat(errors.iterator().next().getIgnoreSubGroup(), is("3000_*[.+_name][!name]"));
     }
 
@@ -116 +117 @@
         assertThat(errors.size(), is(1));
         assertThat(errors.iterator().next().getMessage(), is("footway used with foot=no"));
+        assertThat(errors.iterator().next().getIgnoreSubGroup(), is("3000_way[highway=footway][foot]"));
     }