Changeset 13611 in josm for trunk/src/org/openstreetmap/josm/actions/relation

Timestamp:

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

Author:

Don-vip

Message:

fix #16176 - NPE

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• AddSelectionToRelations.java (modified) (2 diffs)
• DeleteRelationsAction.java (modified) (2 diffs)
• EditRelationAction.java (modified) (2 diffs)

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()) {