Changeset 7941 in josm for trunk/src

Timestamp:

2015-01-08T20:31:17+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10949 - fix false positives in relation checker for multipolygons and boundary relations

File:

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

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

@@ -174 +174 @@
             case WAY:
                 return r.types.contains(TaggingPresetType.WAY);
+            case MULTIPOLYGON:
             case RELATION:
                 return r.types.contains(TaggingPresetType.RELATION);
@@ -235 +236 @@
         }
 
-        if( possibleMatchError != null) {
+        if (possibleMatchError != null) {
             // if any error found, then assume that member type was correct
             // and complain about not matching the memberExpression
@@ -246 +247 @@
 
             // prepare Set of all accepted types in template
-            EnumSet<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
+            Collection<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
             for (Role r: rolePreset.roles) {
                 types.addAll(r.types);