Changeset 16609 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryViewerPanel.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/HistoryViewerPanel.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
+import java.util.function.BiPredicate;
+import java.util.stream.IntStream;
 
 import javax.swing.AbstractAction;
@@ -10 +12 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
 
 import org.openstreetmap.josm.actions.AutoScaleAction;
@@ -94 +97 @@
     }
 
+    /**
+     * Enables semantic highlighting for the {@link org.openstreetmap.josm.data.StructUtils.SerializeOptions}
+     * @param thisSelectionModel selection model
+     * @param thisModel table model (corresponding to the selection model)
+     * @param otherModel table model for the other point in time
+     * @param isSemanticallyEquivalent predicate to determine whether the items should be highlighted
+     */
+    protected void enableSemanticSelectionSynchronization(ListSelectionModel thisSelectionModel,
+                                                          DiffTableModel thisModel, DiffTableModel otherModel,
+                                                          BiPredicate<TwoColumnDiff.Item, TwoColumnDiff.Item> isSemanticallyEquivalent) {
+        selectionSynchronizer.setSelectionIndexMapper((selection, sourceSelectionModel) -> {
+            DiffTableModel sourceModel = sourceSelectionModel == thisSelectionModel ? thisModel : otherModel;
+            DiffTableModel destinationModel = sourceSelectionModel == thisSelectionModel ? otherModel : thisModel;
+            return IntStream.range(0, destinationModel.getRowCount())
+                    .filter(i -> isSemanticallyEquivalent.test(sourceModel.getValueAt(selection, 0), destinationModel.getValueAt(i, 0)));
+        });
+    }
+
     static class ListPopupMenu extends JPopupMenu {
         private final ZoomToObjectAction zoomToObjectAction;