Changeset 16600 in josm

Timestamp:

2020-06-11T14:19:07+02:00 (4 years ago)

Author:

simon04

Message:

see #19330 - SelectionSynchronizer: do not interpolate selection interval gaps

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+
+import org.openstreetmap.josm.gui.util.TableHelper;
 
 /**
@@ -51 +53 @@
         preventRecursion = true;
         DefaultListSelectionModel referenceModel = (DefaultListSelectionModel) e.getSource();
-        int i = referenceModel.getMinSelectionIndex();
-        int j = referenceModel.getMaxSelectionIndex();
         for (ListSelectionModel model : participants) {
             if (model == e.getSource()) {
                 continue;
             }
-            model.setSelectionInterval(i, j);
+            model.clearSelection();
+            for (int i : TableHelper.getSelectedIndices(referenceModel)) {
+                model.addSelectionInterval(i, i);
+            }
         }
         preventRecursion = false;

trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java

@@ -9 +9 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.hot.sds.SeparateDataStorePlugin;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -23 +24 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules rules = new JOSMTestRules().projection();
+    public JOSMTestRules rules = new JOSMTestRules().projection().main();
 
 
@@ -31 +32 @@
     @Test
     public void testUtilityClass() {
+        new SeparateDataStorePlugin(null);
         Logging.clearLastErrorAndWarnings();
         Territories.initialize();