Changeset 13948 in josm for trunk

Timestamp:

2018-06-18T01:12:03+02:00 (6 years ago)

Author:

Don-vip

Message:

fix HistoryHook signature

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserDialogManager.java (modified) (2 diffs)
• HistoryHook.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -220 +220 @@
      */
     public void showHistory(final Collection<? extends PrimitiveId> primitives) {
-        hooks.forEach(h -> h.modifyRequestedIds(primitives));
-        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(primitives, notNewPredicate);
+        final List<PrimitiveId> realPrimitives = new ArrayList<>(primitives);
+        hooks.forEach(h -> h.modifyRequestedIds(realPrimitives));
+        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(realPrimitives, notNewPredicate);
         if (notNewPrimitives.isEmpty()) {
             JOptionPane.showMessageDialog(
@@ -231 +232 @@
         }
 
-        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(primitives, unloadedHistoryPredicate);
+        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(realPrimitives, unloadedHistoryPredicate);
         if (!toLoad.isEmpty()) {
             HistoryLoadTask task = new HistoryLoadTask();

trunk/src/org/openstreetmap/josm/gui/history/HistoryHook.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
-import java.util.Collection;
+import java.util.List;
 
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -20 +20 @@
      * Default implementation is to do no changes.
      * @param ids The current ids to change
+     * @since 13948
      */
-    default void modifyRequestedIds(Collection<? extends PrimitiveId> ids) {
+    default void modifyRequestedIds(List<PrimitiveId> ids) {
     }
 }