Changeset 18049 in josm for trunk

Timestamp:

2021-07-17T16:24:05+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20796 - Delete image file from disk : only remove images from geoimage layer after successful deletion

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/ImageData.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/ImageDataTest.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -267 +265 @@
     /**
      * Remove the current selected image from the list
-     */
-    public void removeSelectedImage() {
-        List<ImageEntry> selectedImages = getSelectedImages();
-        if (selectedImages.size() > 1) {
-            throw new IllegalStateException(tr("Multiple images have been selected"));
-        }
-        removeImages(selectedImages);
-    }
-
-    /**
-     * Remove the current selected image from the list
      * @since 15348
      */
     public void removeSelectedImages() {
-        List<ImageEntry> selectedImages = getSelectedImages();
-        removeImages(selectedImages);
+        removeImages(getSelectedImages());
     }
 
@@ -290 +276 @@
         }
         for (ImageEntry img: getSelectedImages()) {
-            data.remove(img);
-            this.geoImages.remove(img);
-        }
-        if (selectedImagesIndex.get(0) >= data.size()) {
-            setSelectedImageIndex(data.size() - 1);
+            removeImage(img, false);
+        }
+        updateSelectedImage();
+    }
+
+    /**
+     * Update the selected image after removal of one or more images.
+     * @since 18049
+     */
+    public void updateSelectedImage() {
+        int size = data.size();
+        Integer firstSelectedImageIndex = selectedImagesIndex.get(0);
+        if (firstSelectedImageIndex >= size) {
+            setSelectedImageIndex(size - 1);
         } else {
-            setSelectedImageIndex(selectedImagesIndex.get(0), true);
+            setSelectedImageIndex(firstSelectedImageIndex, true);
         }
     }
@@ -307 +302 @@
      */
     public boolean isImageSelected(ImageEntry image) {
-        int index = data.indexOf(image);
-        return selectedImagesIndex.contains(index);
+        return selectedImagesIndex.contains(data.indexOf(image));
     }
 
@@ -316 +310 @@
      */
     public void removeImage(ImageEntry img) {
+        removeImage(img, true);
+    }
+
+    /**
+     * Remove the image from the list and optionnally trigger update listener
+     * @param img the {@link ImageEntry} to remove
+     * @param fireUpdateEvent if {@code true}, notifies listeners of image update
+     * @since xxx
+     */
+    public void removeImage(ImageEntry img, boolean fireUpdateEvent) {
         data.remove(img);
         this.geoImages.remove(img);
-        notifyImageUpdate();
+        if (fireUpdateEvent) {
+            notifyImageUpdate();
+        }
     }
 

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

@@ -344 +344 @@
 
                 if (result == 2) {
-                    currentData.removeSelectedImages();
                     for (ImageEntry delete : toDelete) {
                         if (Utils.deleteFile(delete.getFile())) {
-                            Logging.info("File " + delete.getFile() + " deleted.");
+                            currentData.removeImage(delete, false);
+                            Logging.info("File {0} deleted.", delete.getFile());
                         } else {
                             JOptionPane.showMessageDialog(
@@ -357 +357 @@
                         }
                     }
+                    currentData.notifyImageUpdate();
+                    currentData.updateSelectedImage();
                 }
             }

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

@@ -55 +55 @@
         assertFalse(data.hasNextImage());
         assertFalse(data.hasPreviousImage());
-        data.removeSelectedImage();
+        data.removeSelectedImages();
     }
 
@@ -182 +182 @@
 
     @Test
-    void testRemoveSelectedImage() {
-        List<ImageEntry> list = getOneImage();
-        ImageData data = new ImageData(list);
-        data.selectFirstImage();
-        data.removeSelectedImage();
+    void testRemoveSelectedImages() {
+        List<ImageEntry> list = getOneImage();
+        list.add(new ImageEntry());
+
+        ImageData data = new ImageData(list);
+        data.selectFirstImage();
+        data.addImageToSelection(list.get(1));
+        data.removeSelectedImages();
         assertEquals(0, data.getImages().size());
         assertEquals(0, data.getSelectedImages().size());
@@ -192 +195 @@
 
     @Test
-    void testRemoveSelectedImages() {
-        List<ImageEntry> list = getOneImage();
-        list.add(new ImageEntry());
-
-        ImageData data = new ImageData(list);
-        data.selectFirstImage();
-        data.addImageToSelection(list.get(1));
-        data.removeSelectedImages();
-        assertEquals(0, data.getImages().size());
-        assertEquals(0, data.getSelectedImages().size());
-    }
-
-    @Test
     void testRemoveSelectedImagesWithRemainingImages() {
         List<ImageEntry> list = getOneImage();
@@ -261 +251 @@
         data.addImageDataUpdateListener(listener);
         data.selectFirstImage();
-        data.removeSelectedImage();
+        data.removeSelectedImages();
     }