Changeset 13611 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-04-10T19:02:58+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16176 - NPE

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/OsmUtils.java (modified) (2 diffs)
• validation/TestError.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
@@ -153 +155 @@
         return layer1;
     }
+
+    /**
+     * Determines if the given collection contains primitives, and that none of them belong to a locked layer.
+     * @param collection collection of OSM primitives
+     * @return {@code true} if the given collection is not empty and does not contain any primitive in a locked layer.
+     * @since 13611
+     */
+    public static boolean isOsmCollectionEditable(Collection<? extends OsmPrimitive> collection) {
+        return collection != null && !collection.isEmpty()
+            && collection.stream().map(OsmPrimitive::getDataSet).filter(Objects::nonNull).noneMatch(DataSet::isLocked);
+    }
 }

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

@@ -12 +12 @@
 
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -360 +360 @@
     public boolean isFixable() {
         return (fixingCommand != null || ((tester != null) && tester.isFixable(this)))
-                && primitives.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked);
+                && OsmUtils.isOsmCollectionEditable(primitives);
     }