Changeset 11587 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

2017-02-19T23:52:08+01:00 (7 years ago)

Author:

Don-vip

Message:

checkstyle - enable BooleanExpressionComplexity / 6

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -1178 +1178 @@
      */
     public boolean hasEqualTechnicalAttributes(OsmPrimitive other) {
+        // CHECKSTYLE.OFF: BooleanExpressionComplexity
         return other != null
             && timestamp == other.timestamp
@@ -1186 +1187 @@
             && isVisible() == other.isVisible()
             && Objects.equals(user, other.user);
+        // CHECKSTYLE.ON: BooleanExpressionComplexity
     }
 
@@ -1354 +1356 @@
                 || "yes".equals(get("area"))
                 || "riverbank".equals(get("waterway"))
-                || hasKey("natural")
-                || hasKey("amenity")
-                || hasKey("leisure")
-                || hasKey("building")
-                || hasKey("building:part");
+                || hasKey("natural", "amenity", "leisure", "building", "building:part");
     }