Changeset 8266 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
- Timestamp:
- 2015-04-25T19:13:12+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r8265 r8266 147 147 /** 148 148 * Creates the fixing {@link Command} for the given primitive. The {@code matchingSelector} is used to 149 * evaluate placeholders (cf. {@link org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck#insertArguments(Selector, String )}).149 * evaluate placeholders (cf. {@link org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck#insertArguments(Selector, String, OsmPrimitive)}). 150 150 */ 151 151 abstract Command createCommand(final OsmPrimitive p, final Selector matchingSelector); … … 167 167 return null; 168 168 } 169 return TagCheck.insertArguments(matchingSelector, s );169 return TagCheck.insertArguments(matchingSelector, s, p); 170 170 } 171 171 … … 386 386 * {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector}. 387 387 */ 388 static String determineArgument(Selector.GeneralSelector matchingSelector, int index, String type ) {388 static String determineArgument(Selector.GeneralSelector matchingSelector, int index, String type, OsmPrimitive p) { 389 389 try { 390 390 final Condition c = matchingSelector.getConditions().get(index); 391 391 final Tag tag = c instanceof Condition.KeyCondition 392 ? ((Condition.KeyCondition) c).asTag( )392 ? ((Condition.KeyCondition) c).asTag(p) 393 393 : c instanceof Condition.SimpleKeyValueCondition 394 394 ? ((Condition.SimpleKeyValueCondition) c).asTag() … … 417 417 * key/value/tag of the {@code index}-th {@link Condition} of {@code matchingSelector}. 418 418 */ 419 static String insertArguments(Selector matchingSelector, String s ) {419 static String insertArguments(Selector matchingSelector, String s, OsmPrimitive p) { 420 420 if (s != null && matchingSelector instanceof Selector.ChildOrParentSelector) { 421 return insertArguments(((Selector.ChildOrParentSelector)matchingSelector).right, s);421 return insertArguments(((Selector.ChildOrParentSelector)matchingSelector).right, s, p); 422 422 } else if (s == null || !(matchingSelector instanceof GeneralSelector)) { 423 423 return s; … … 426 426 final StringBuffer sb = new StringBuffer(); 427 427 while (m.find()) { 428 final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, Integer.parseInt(m.group(1)), m.group(2) );428 final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, Integer.parseInt(m.group(1)), m.group(2), p); 429 429 try { 430 430 // Perform replacement with null-safe + regex-safe handling … … 501 501 */ 502 502 String getDescriptionForMatchingSelector(OsmPrimitive p, Selector matchingSelector) { 503 return insertArguments(matchingSelector, getDescription(p) );503 return insertArguments(matchingSelector, getDescription(p), p); 504 504 } 505 505
Note:
See TracChangeset
for help on using the changeset viewer.