Changeset 6400 in josm for trunk/src

Timestamp:

2013-11-22T22:15:16+01:00 (11 years ago)

Author:

simon04

Message:

fix #7465 - NullPointerException in WayConnectedToArea due to Way w/ 0 nodes

Location:

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

Files:

• Test.java (modified) (1 diff)
• tests/UntaggedWay.java (modified) (1 diff)

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

@@ -154 +154 @@
         progressMonitor.setTicksCount(selection.size());
         for (OsmPrimitive p : selection) {
-            if (p.isUsable()) {
+            if (isPrimitiveUsable(p)) {
                 p.accept(this);
             }
             progressMonitor.worked(1);
         }
+    }
+
+    public boolean isPrimitiveUsable(OsmPrimitive p) {
+        return p.isUsable() && (!(p instanceof Way) || (((Way) p).getNodesCount() > 1)); // test only Ways with at least 2 nodes
     }
 

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

@@ -153 +153 @@
         return deletePrimitivesIfNeeded(testError.getPrimitives());
     }
+
+    @Override
+    public boolean isPrimitiveUsable(OsmPrimitive p) {
+        return p.isUsable();
+    }
 }