Changeset 17996 in josm

Timestamp:

2021-07-11T04:22:04+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20965 - History browser: fix NPE when restoring deleted tag value (regression from r17773, patch by Bjoeni) + add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/RestorePropertyAction.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/actions/RestorePropertyActionTest.java (added)

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -56 +56 @@
 
         Map<String, String> changes = TableHelper.selectedIndices(selectionModel).boxed()
-                .collect(Collectors.toMap(keyFn::apply, valueFn::apply, (a, b) -> b));
+                .collect(HashMap::new, (m,i)->m.put(keyFn.apply(i), valueFn.apply(i)), HashMap::putAll);
         ChangePropertyCommand command = new ChangePropertyCommand(Collections.singleton(primitive), changes);
         UndoRedoHandler.getInstance().add(command);