Changeset 16609 in josm for trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java

Timestamp:

2020-06-11T22:48:46+02:00 (4 years ago)

Author:

simon04

Message:

fix #19330 - History browser: Add semantic check to select equivalent nodes/members on opposite sides

File:

• trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.stream.IntStream;
 
-import javax.swing.DefaultListSelectionModel;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
@@ -23 +25 @@
     private final Set<ListSelectionModel> participants;
     private boolean preventRecursion;
+    private BiFunction<Integer, ListSelectionModel, IntStream> selectionIndexMapper = (i, model) -> IntStream.of(i);
 
     /**
@@ -47 +50 @@
     }
 
+    void setSelectionIndexMapper(BiFunction<Integer, ListSelectionModel, IntStream> selectionIndexMapper) {
+        this.selectionIndexMapper = Objects.requireNonNull(selectionIndexMapper);
+    }
+
     @Override
     public void valueChanged(ListSelectionEvent e) {
@@ -53 +60 @@
         }
         preventRecursion = true;
-        DefaultListSelectionModel referenceModel = (DefaultListSelectionModel) e.getSource();
+        ListSelectionModel referenceModel = (ListSelectionModel) e.getSource();
         int[] selectedIndices = TableHelper.getSelectedIndices(referenceModel);
         for (ListSelectionModel model : participants) {
-            if (model == e.getSource()) {
+            if (model == referenceModel) {
                 continue;
             }
-            TableHelper.setSelectedIndices(model, Arrays.stream(selectedIndices));
+            TableHelper.setSelectedIndices(model,
+                    Arrays.stream(selectedIndices).flatMap(i -> selectionIndexMapper.apply(i, referenceModel)));
         }
         preventRecursion = false;