Changeset 17081 in josm for trunk

Timestamp:

2020-10-01T21:17:32+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #19865 - IOOBE selecting several pictures and attempting to delete them (patch by francois2)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/ImageData.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/ImageDataTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/ImageData.java

@@ -267 +267 @@
             data.remove(img);
         }
-        if (selectedImagesIndex.get(0) == data.size()) {
+        if (selectedImagesIndex.get(0) >= data.size()) {
             setSelectedImageIndex(data.size() - 1);
         } else {

trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java

@@ -196 +196 @@
 
     @Test
+    public void testRemoveSelectedImagesWithRemainingImages() {
+        List<ImageEntry> list = getOneImage();
+        list.add(new ImageEntry());
+        list.add(new ImageEntry());
+
+        ImageData data = new ImageData(list);
+        data.selectLastImage();
+        data.addImageToSelection(list.get(1));
+        data.removeSelectedImages();
+        assertEquals(1, data.getImages().size());
+        assertEquals(1, data.getSelectedImages().size());
+    }
+
+    @Test
     public void testSelectImageAfterRemove() {
         List<ImageEntry> list = getOneImage();
@@ -347 +361 @@
         data.selectFirstImage();
         assertEquals(1, data.getSelectedImages().size());
-
     }