Changeset 7885 in josm for trunk/src

Timestamp:

2014-12-25T16:38:00+01:00 (9 years ago)

Author:

Don-vip

Message:

see #9844 - code cleanup

File:

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

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

@@ -15 +15 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -168 +167 @@
     private boolean checkMemberType(Role r, RelationMember member) {
         if (r.types != null) {
-            if (member.getDisplayType().equals(OsmPrimitiveType.NODE)) {
+            switch (member.getDisplayType()) {
+            case NODE:
                 return r.types.contains(TaggingPresetType.NODE);
-            }
-            if (member.getDisplayType().equals(OsmPrimitiveType.CLOSEDWAY)) {
+            case CLOSEDWAY:
                 return r.types.contains(TaggingPresetType.CLOSEDWAY);
-            }
-            if (member.getDisplayType().equals(OsmPrimitiveType.WAY)) {
+            case WAY:
                 return r.types.contains(TaggingPresetType.WAY);
-            }
-            if (member.getDisplayType().equals(OsmPrimitiveType.RELATION)) {
+            case RELATION:
                 return r.types.contains(TaggingPresetType.RELATION);
-            }
-            // not matching type
-            return false;
+            default: // not matching type
+                return false;
+            }
         } else {
             // if no types specified, then test is passed