Changeset 6636 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests
- Timestamp:
- 2014-01-05T19:32:00+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r6612 r6636 40 40 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser; 41 41 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException; 42 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference; 42 43 import org.openstreetmap.josm.gui.widgets.EditableList; 43 44 import org.openstreetmap.josm.io.MirroredInputStream; … … 284 285 */ 285 286 String getMessage() { 286 return errors. keySet().iterator().next();287 return errors.isEmpty() ? null : errors.keySet().iterator().next(); 287 288 } 288 289 … … 313 314 314 315 Severity getSeverity() { 315 return errors. values().iterator().next();316 return errors.isEmpty() ? null : errors.values().iterator().next(); 316 317 } 317 318 … … 364 365 * Obtains all {@link TestError}s for the {@link OsmPrimitive} {@code p}. 365 366 */ 366 public Collection<TestError> getErrorsForPrimitive(OsmPrimitive p ) {367 public Collection<TestError> getErrorsForPrimitive(OsmPrimitive p, boolean includeOtherSeverity) { 367 368 final ArrayList<TestError> r = new ArrayList<TestError>(); 368 369 final Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null); 369 370 for (TagCheck check : checks) { 371 if (Severity.OTHER.equals(check.getSeverity()) && !includeOtherSeverity) { 372 continue; 373 } 370 374 final Selector selector = check.whichSelectorMatchesEnvironment(env); 371 375 if (selector != null) { … … 388 392 @Override 389 393 public void check(OsmPrimitive p) { 390 errors.addAll(getErrorsForPrimitive(p ));394 errors.addAll(getErrorsForPrimitive(p, ValidatorPreference.PREF_OTHER.get())); 391 395 } 392 396
Note:
See TracChangeset
for help on using the changeset viewer.