Changeset 18338 in josm

Timestamp:

2021-12-20T16:50:08+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #21655 - fix selection of changesets after sorting the table

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset

Files:

• ChangesetCacheManager.java (modified) (3 diffs)
• ChangesetCacheManagerModel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

@@ -110 +110 @@
 
     private ChangesetCacheManagerModel model;
+    private ChangesetCacheTableRowSorter sorter;
     private JSplitPane spContent;
     private boolean needsSplitPaneAdjustment;
@@ -272 +273 @@
                 model.getSelectionModel()
         );
-        tblChangesets.setRowSorter(new ChangesetCacheTableRowSorter(model));
+        tblChangesets.setRowSorter(sorter);
         tblChangesets.addMouseListener(new MouseEventHandler());
         InputMapUtils.addEnterAction(tblChangesets, new ShowDetailAction(model));
@@ -304 +305 @@
 
         model = buildModel();
+        sorter = new ChangesetCacheTableRowSorter(model);
+        model.setChangesetCacheTableRowSorter(sorter);
         actRemoveFromCacheAction = new RemoveFromCacheAction(model);
         actCloseSelectedChangesetsAction = new CloseSelectedChangesetsAction(model);

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java

@@ -5 +5 @@
 import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -32 +33 @@
     private final transient List<Changeset> data = new ArrayList<>();
     private final DefaultListSelectionModel selectionModel;
+    private transient ChangesetCacheTableRowSorter sorter;
     private transient Changeset changesetInDetailView;
     private final PropertyChangeSupport support = new PropertyChangeSupport(this);
@@ -88 +90 @@
      */
     public List<Changeset> getSelectedChangesets() {
-        List<Changeset> ret = new ArrayList<>();
-        for (int i = 0; i < data.size(); i++) {
-            Changeset cs = data.get(i);
-            if (selectionModel.isSelectedIndex(i)) {
-                ret.add(cs);
-            }
-        }
-        return ret;
+        return Arrays.stream(TableHelper.getSelectedIndices(selectionModel))
+                .map(sorter::convertRowIndexToModel).mapToObj(data::get).collect(Collectors.toList());
     }
 
@@ -166 +162 @@
     }
 
+    void setChangesetCacheTableRowSorter(ChangesetCacheTableRowSorter sorter) {
+        this.sorter = sorter;
+    }
+
     /* ------------------------------------------------------------------------------ */
     /* interface ChangesetCacheListener                                               */