Changeset 18685 in josm

Timestamp:

2023-03-07T21:44:32+01:00 (16 months ago)

Author:

taylor.smock

Message:

Fix #22767: Geotagged image deletion does not move to the next/previous image

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialogTest.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -573 +573 @@
                     imageEntry.remove();
                 }
+                selectNextImageAfterDeletion(imageEntry);
+            }
+        }
+
+        /**
+         * Select the logical next entry after deleting the currently viewed image
+         * @param oldEntry The image entry that was just deleted
+         */
+        private void selectNextImageAfterDeletion(IImageEntry<?> oldEntry) {
+            final IImageEntry<?> currentImageEntry = ImageViewerDialog.this.currentEntry;
+            // This is mostly just in case something changes the displayed entry (aka avoid race condition) or an image provider
+            // sets the next image itself.
+            if (Objects.equals(currentImageEntry, oldEntry)) {
+                final IImageEntry<?> nextImage;
+                if (oldEntry instanceof ImageEntry) {
+                    nextImage = ((ImageEntry) oldEntry).getDataSet().getSelectedImage();
+                } else if (oldEntry.getNextImage() != null) {
+                    nextImage = oldEntry.getNextImage();
+                } else if (oldEntry.getPreviousImage() != null) {
+                    nextImage = oldEntry.getPreviousImage();
+                } else {
+                    nextImage = null;
+                }
+                ImageViewerDialog.getInstance().displayImages(nextImage == null ? null : Collections.singletonList(nextImage));
             }
         }
@@ -588 +612 @@
         public void actionPerformed(ActionEvent e) {
             if (currentEntry != null) {
-                List<IImageEntry<?>> toDelete = currentEntry instanceof ImageEntry ?
-                        new ArrayList<>(((ImageEntry) currentEntry).getDataSet().getSelectedImages())
-                        : Collections.singletonList(currentEntry);
+                IImageEntry<?> oldEntry = ImageViewerDialog.this.currentEntry;
+                List<IImageEntry<?>> toDelete = oldEntry instanceof ImageEntry ?
+                        new ArrayList<>(((ImageEntry) oldEntry).getDataSet().getSelectedImages())
+                        : Collections.singletonList(oldEntry);
                 int size = toDelete.size();
 
@@ -631 +656 @@
                         data.updateSelectedImage();
                     });
+                    ImageViewerDialog.this.imageRemoveAction.selectNextImageAfterDeletion(oldEntry);
                 }
             }