Changeset 16216 in josm for trunk

Timestamp:

2020-03-29T08:09:25+02:00 (5 years ago)

Author:

GerdP

Message:

see #18919: Allow sorting of table content in changeset manager to facilitate finding related rows

• partly revert r16121: don't use setAutoCreateRowSorter() in ChangesetCacheManager. This requires a lot more changes to make it work
• fix handling of selected rows after sorting of rows in ChangesetContentPanel

Location:

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

Files:

• ChangesetCacheManager.java (modified) (1 diff)
• ChangesetContentPanel.java (modified) (8 diffs)
• ChangesetContentTableModel.java (modified) (2 diffs)

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

@@ -272 +272 @@
                 model.getSelectionModel()
         );
-        tblChangesets.setAutoCreateRowSorter(true);
         tblChangesets.addMouseListener(new MouseEventHandler());
         InputMapUtils.addEnterAction(tblChangesets, new ShowDetailAction(model));

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

@@ -70 +70 @@
  */
 public class ChangesetContentPanel extends JPanel implements PropertyChangeListener, ChangesetAware {
-
+    private JTable tblContent;
     private ChangesetContentTableModel model;
     private transient Changeset currentChangeset;
@@ -122 +122 @@
     protected JPanel buildContentPanel() {
         JPanel pnl = new JPanel(new BorderLayout());
-        JTable tblContent = new JTable(
+        tblContent = new JTable(
                 model,
                 new ChangesetContentTableColumnModel(),
@@ -212 +212 @@
                 title, JOptionPane.WARNING_MESSAGE, helpTopic
         );
+    }
+
+    private Set<HistoryOsmPrimitive> getSelectedPrimitives() {
+      return model.getSelectedPrimitives(tblContent);
     }
 
@@ -288 +292 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Set<HistoryOsmPrimitive> selected = model.getSelectedPrimitives();
+            Set<HistoryOsmPrimitive> selected = getSelectedPrimitives();
             if (selected.isEmpty()) return;
             showHistory(selected);
@@ -310 +314 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            final List<PrimitiveId> primitiveIds = model.getSelectedPrimitives().stream().map(HistoryOsmPrimitive::getPrimitiveId)
+            final List<PrimitiveId> primitiveIds = getSelectedPrimitives().stream().map(HistoryOsmPrimitive::getPrimitiveId)
                     .collect(Collectors.toList());
             MainApplication.worker.submit(new DownloadPrimitivesWithReferrersTask(false, primitiveIds, true, true, null, null));
@@ -330 +334 @@
             DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
             if (isEnabled() && ds != null) {
-                return model.getSelectedPrimitives().stream()
+                return getSelectedPrimitives().stream()
                         .map(p -> ds.getPrimitiveById(p.getPrimitiveId())).filter(Objects::nonNull).collect(Collectors.toSet());
             }
@@ -364 +368 @@
             final Set<OsmPrimitive> target = getTarget();
             if (target.isEmpty()) {
-                alertNoPrimitivesTo(model.getSelectedPrimitives(), tr("Nothing to select"),
+                alertNoPrimitivesTo(getSelectedPrimitives(), tr("Nothing to select"),
                         HelpUtil.ht("/Dialog/ChangesetCacheManager#NothingToSelectInLayer"));
                 return;
@@ -385 +389 @@
             final Set<OsmPrimitive> target = getTarget();
             if (target.isEmpty()) {
-                alertNoPrimitivesTo(model.getSelectedPrimitives(), tr("Nothing to zoom to"),
+                alertNoPrimitivesTo(getSelectedPrimitives(), tr("Nothing to zoom to"),
                         HelpUtil.ht("/Dialog/ChangesetCacheManager#NothingToZoomTo"));
                 return;

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

@@ -9 +9 @@
 
 import javax.swing.DefaultListSelectionModel;
+import javax.swing.JTable;
 import javax.swing.table.AbstractTableModel;
 
@@ -60 +61 @@
     /**
      * Returns the selected history primitives.
+     * @param table the JTable used with this model
      * @return the selected history primitives
      */
-    public Set<HistoryOsmPrimitive> getSelectedPrimitives() {
+    public Set<HistoryOsmPrimitive> getSelectedPrimitives(JTable table) {
         Set<HistoryOsmPrimitive> ret = new HashSet<>();
-        for (int i = 0; i < data.size(); i++) {
-            if (selectionModel.isSelectedIndex(i)) {
-                ret.add(data.get(i).getPrimitive());
-            }
+        int[] selection = table.getSelectedRows();
+        for (int i = 0; i < selection.length; i++) {
+            ret.add(data.get(table.convertRowIndexToModel(selection[i])).getPrimitive());
         }
         return ret;