Changeset 19108 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java

Timestamp:

2024-06-17T19:37:02+02:00 (4 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x (followup of r19101)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java (modified) (1 diff)

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

@@ -52 +52 @@
 
     private void testForError(Way w, Node wayNode, OsmPrimitive p) {
-        if (wayNode.isOutsideDownloadArea()
-                || wayNode.getReferrers().stream().anyMatch(p1 -> p1.hasTag("route", "ferry"))) {
-            return;
-        } else if (isArea(p)) {
-            addPossibleError(w, wayNode, p, p);
-        } else {
-            p.referrers(Relation.class)
-                    .filter(r -> r.isMultipolygon() && isArea(r))
-                    .findFirst()
-                    .ifPresent(r -> addPossibleError(w, wayNode, p, r));
+        if (!wayNode.isOutsideDownloadArea()
+                && wayNode.getReferrers().stream().noneMatch(p1 -> p1.hasTag("route", "ferry"))) {
+            if (isArea(p)) {
+                addPossibleError(w, wayNode, p, p);
+            } else {
+                p.referrers(Relation.class)
+                        .filter(r -> r.isMultipolygon() && isArea(r))
+                        .findFirst()
+                        .ifPresent(r -> addPossibleError(w, wayNode, p, r));
+            }
         }
     }