Changeset 15357 in josm for trunk

Timestamp:

2019-09-19T11:46:51+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18142 - fix AIOOBE after changing imagery source filter in imagery preferences

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java

@@ -24 +24 @@
 import java.util.Set;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -348 +349 @@
                 // Only process complete (final) selection events
                 for (int i = e.getFirstIndex(); i <= e.getLastIndex(); i++) {
-                    updateBoundsAndShapes(defaultTable.convertRowIndexToModel(i));
-                }
+                    if (i < defaultTable.getRowCount()) {
+                        updateBoundsAndShapes(defaultTable.convertRowIndexToModel(i));
+                    }
+                }
+                // Cleanup residual selected bounds which may have disappeared after a filter
+                cleanupResidualBounds();
                 // If needed, adjust map to show all map rectangles and polygons
                 if (!mapRectangles.isEmpty() || !mapPolygons.isEmpty()) {
@@ -405 +410 @@
             }
         }
+
+        private <T> void doCleanupResidualBounds(Map<Integer, T> map, Consumer<T> removalEffect) {
+            for (Integer i : map.keySet()) {
+                int viewIndex = defaultTable.convertRowIndexToView(i);
+                if (!defaultTable.getSelectionModel().isSelectedIndex(viewIndex)) {
+                    removalEffect.accept(map.remove(i));
+                }
+            }
+        }
+
+        private void cleanupResidualBounds() {
+            doCleanupResidualBounds(mapPolygons, l -> l.forEach(defaultMap::removeMapPolygon));
+            doCleanupResidualBounds(mapRectangles, defaultMap::removeMapRectangle);
+        }
     }