Changeset 13611 in josm

Timestamp:

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

Author:

Don-vip

Message:

fix #16176 - NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CombineWayAction.java (modified) (4 diffs)
• actions/JosmAction.java (modified) (2 diffs)
• actions/MergeNodesAction.java (modified) (2 diffs)
• actions/MoveNodeAction.java (modified) (2 diffs)
• actions/SplitWayAction.java (modified) (2 diffs)
• actions/relation/AddSelectionToRelations.java (modified) (2 diffs)
• actions/relation/DeleteRelationsAction.java (modified) (2 diffs)
• actions/relation/EditRelationAction.java (modified) (2 diffs)
• data/osm/OsmUtils.java (modified) (2 diffs)
• data/validation/TestError.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -14 +14 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -28 +29 @@
 import org.openstreetmap.josm.data.osm.NodeGraph;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;
@@ -115 +117 @@
             return null;
 
-        List<DataSet> dataSets = ways.stream().map(Way::getDataSet).distinct().collect(Collectors.toList());
+        List<DataSet> dataSets = ways.stream().map(Way::getDataSet).filter(Objects::nonNull).distinct().collect(Collectors.toList());
         if (dataSets.size() != 1) {
             throw new IllegalArgumentException("Cannot combine ways of multiple data sets.");
@@ -251 +253 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         int numWays = 0;
-        if (selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked)) {
+        if (OsmUtils.isOsmCollectionEditable(selection)) {
             for (OsmPrimitive osm : selection) {
                 if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) {

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
@@ -365 +366 @@
      */
     protected final void updateEnabledStateOnModifiableSelection(Collection<? extends OsmPrimitive> selection) {
-        setEnabled(selection != null && !selection.isEmpty()
-                && selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked));
+        setEnabled(OsmUtils.isOsmCollectionEditable(selection));
     }
 

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 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.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;
@@ -365 +365 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        if (selection == null || selection.isEmpty()
-                || selection.stream().map(OsmPrimitive::getDataSet).anyMatch(DataSet::isLocked)) {
-            setEnabled(false);
-            return;
-        }
-        boolean ok = true;
-        for (OsmPrimitive osm : selection) {
-            if (!(osm instanceof Node)) {
-                ok = false;
-                break;
+        boolean ok = OsmUtils.isOsmCollectionEditable(selection);
+        if (ok) {
+            for (OsmPrimitive osm : selection) {
+                if (!(osm instanceof Node)) {
+                    ok = false;
+                    break;
+                }
             }
         }

trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java

@@ -11 +11 @@
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.data.coor.LatLon;
-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.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.LatLonDialog;
@@ -62 +62 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        if (selection == null || selection.isEmpty()
-                || selection.stream().map(OsmPrimitive::getDataSet).anyMatch(DataSet::isLocked)) {
-            setEnabled(false);
-            return;
-        }
-        if ((selection.size()) == 1 && (selection.toArray()[0] instanceof Node)) {
-            setEnabled(true);
-        } else {
-            setEnabled(false);
-        }
+        setEnabled(OsmUtils.isOsmCollectionEditable(selection) && selection.size() == 1 && selection.toArray()[0] instanceof Node);
     }
 }

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -26 +26 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.SplitWayCommand;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 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.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -296 +296 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         // Selection still can be wrong, but let SplitWayAction process and tell user what's wrong
-        setEnabled(selection != null && !selection.isEmpty()
-                && selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked)
+        setEnabled(OsmUtils.isOsmCollectionEditable(selection)
                 && selection.stream().anyMatch(o -> o instanceof Node && !o.isIncomplete()));
     }

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 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.gui.MainApplication;
@@ -70 +71 @@
     @Override
     public void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) {
-        GuiHelper.runInEDT(() -> setEnabled(newSelection != null && !newSelection.isEmpty() && !relations.isEmpty()
-                && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isLocked)));
+        GuiHelper.runInEDT(() -> setEnabled(newSelection != null && !newSelection.isEmpty()
+                && OsmUtils.isOsmCollectionEditable(relations)));
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -51 +51 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!relations.isEmpty() && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isLocked));
+        setEnabled(OsmUtils.isOsmCollectionEditable(relations));
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.DataSet;
 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.RelationMember;
@@ -89 +89 @@
     protected void updateEnabledState() {
         boolean enabled = false;
-        if (relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isLocked)) {
+        if (OsmUtils.isOsmCollectionEditable(relations)) {
             for (Relation r : relations) {
                 if (!r.isDeleted()) {

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);
     }