Changeset 18001 in josm for trunk/src

Timestamp:

2021-07-11T14:39:42+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21095 - see #21041 - fix NPE when opening the preset editor with new objects

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPresetValidation.java (modified) (1 diff)

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

@@ -238 +238 @@
      * @param ways ways to clone
      * @param relations relations to clone
-     * @since 17981
-     */
-    public void clonePrimitives(Iterable<Node> nodes, Iterable<Way> ways, Iterable<Relation> relations) {
+     * @return the map of cloned primitives indexed by their original version
+     * @since 18001
+     */
+    public Map<OsmPrimitive, OsmPrimitive> clonePrimitives(Iterable<Node> nodes, Iterable<Way> ways, Iterable<Relation> relations) {
         Map<OsmPrimitive, OsmPrimitive> primMap = new HashMap<>();
         for (Node n : nodes) {
@@ -268 +269 @@
                     .collect(Collectors.toList()));
         }
+        return primMap;
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetValidation.java

@@ -80 +80 @@
         DataSet ds = new DataSet();
         Collection<OsmPrimitive> primitives = FilterModel.getAffectedPrimitives(singleton(original));
-        ds.clonePrimitives(
+        OsmPrimitive primitive = ds.clonePrimitives(
                 new SubclassFilteredCollection<>(primitives, INode.class::isInstance),
                 new SubclassFilteredCollection<>(primitives, IWay.class::isInstance),
-                new SubclassFilteredCollection<>(primitives, IRelation.class::isInstance));
-        OsmPrimitive primitive = ds.getPrimitiveById(original.getOsmPrimitiveId());
+                new SubclassFilteredCollection<>(primitives, IRelation.class::isInstance))
+                .get(original);
         Command command = TaggingPreset.createCommand(singleton(primitive), changedTags);
         if (command != null) {