Changeset 18603 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

2022-11-22T14:37:25+01:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #20849: WARNING: row index is bigger than sorter's row count. Most likely this is a wrong sorter usage

This is caused by the ordering of the TableModelListeners for
availableSourcesModel. While not documented, Java fires the listeners in reverse
order, so we want to remove the listener that updates the sorter and add the
column width adjustment listener, and then re-add the listener that updates the
sorter.

The alternative to adding/removing the listener for the sorter is to use an
AtomicReference for tblAvailableSources and add the adjustColumnWidth listener
before creating the tblAvailableSources.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -152 +152 @@
         this.availableSourcesModel = new AvailableSourcesModel();
         this.tblAvailableSources = new ScrollHackTable(availableSourcesModel);
+        // This add/remove listener code is needed to fix #20849. Java fires table listeners in the reverse order
+        // in which they were added, and we need the model to have been updated before we call the adjustColumnWidth code.
+        // So we remove the JTable and re-add it as a listener after we add the column width adjustment
+        availableSourcesModel.addTableModelListener(e -> TableHelper.adjustColumnWidth(tblAvailableSources, 0, 800));
+        availableSourcesModel.removeTableModelListener(this.tblAvailableSources);
+        availableSourcesModel.addTableModelListener(this.tblAvailableSources);
         this.tblAvailableSources.setAutoCreateRowSorter(true);
         this.tblAvailableSources.setSelectionModel(selectionModel);
@@ -191 +197 @@
         // Force Swing to show horizontal scrollbars for the JTable
         // Yes, this is a little ugly, but should work
-        availableSourcesModel.addTableModelListener(e -> TableHelper.adjustColumnWidth(tblAvailableSources, 0, 800));
         activeSourcesModel.addTableModelListener(e -> TableHelper.adjustColumnWidth(tblActiveSources, canEnable ? 1 : 0, 800));
         activeSourcesModel.setActiveSources(getInitialSourcesList());