Changeset 11135 in josm for trunk/src

Timestamp:

2016-10-16T20:21:27+02:00 (8 years ago)

Author:

simon04

Message:

see #13799 - NPE in MultipolygonTest

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• TestError.java (modified) (4 diffs)
• tests/MultipolygonTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -140 +140 @@
         public Builder primitives(Collection<? extends OsmPrimitive> primitives) {
             CheckParameterUtil.ensureThat(this.primitives == null, "primitives already set");
+            CheckParameterUtil.ensureParameterNotNull(primitives, "primitives");
             this.primitives = primitives;
             if (this.highlighted == null) {
@@ -166 +167 @@
          */
         public Builder highlight(Collection<? extends OsmPrimitive> highlighted) {
+            CheckParameterUtil.ensureParameterNotNull(highlighted, "highlighted");
             this.highlighted = highlighted;
             return this;
@@ -178 +180 @@
          */
         public Builder highlightWaySegments(Collection<WaySegment> highlighted) {
+            CheckParameterUtil.ensureParameterNotNull(highlighted, "highlighted");
             this.highlighted = highlighted;
             return this;
@@ -190 +193 @@
          */
         public Builder highlightNodePairs(Collection<List<Node>> highlighted) {
+            CheckParameterUtil.ensureParameterNotNull(highlighted, "highlighted");
             this.highlighted = highlighted;
             return this;

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

@@ -400 +400 @@
             for (OsmPrimitive p : primitives) {
                 if (!p.isIncomplete()) {
-                    return null;
+                    return primitives;
                 }
             }