Changeset 18278 in josm for trunk/src

Timestamp:

2021-10-17T06:14:05+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21430 - Fix deletion of images (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/street_level/IImageEntry.java (modified) (3 diffs)
• gui/layer/geoimage/ImageEntry.java (modified) (2 diffs)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java

@@ -8 +8 @@
 import java.time.Instant;
 import java.util.List;
+
 import javax.imageio.IIOParam;
 
@@ -16 +17 @@
  * An interface for image entries that will be shown in {@link org.openstreetmap.josm.gui.layer.geoimage.ImageDisplay}
  * @author Taylor Smock
+ * @param <I> type of image
  * @since 18246
  */
@@ -94 +96 @@
 
     /**
+     * Delete the image
+     * @return {@code true} if deletion was successful
+     * @throws UnsupportedOperationException If the implementation does not support deletion.
+     * Use {@link #isDeleteSupported()}} to check for support.
+     * @since 18278
+     */
+    default boolean delete() {
+        throw new UnsupportedOperationException("remove is not supported for " + this.getClass().getSimpleName());
+    }
+
+    /**
+     * Check if image deletion is supported
+     * @return {@code true} if deletion is supported
+     * @since 18278
+     */
+    default boolean isDeleteSupported() {
+        return false;
+    }
+
+    /**
      * Returns a display name for this entry (shown in image viewer title bar)
      * @return a display name for this entry

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

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -189 +190 @@
         this.dataSet.removeImage(this, false);
         return true;
+    }
+
+    @Override
+    public boolean isDeleteSupported() {
+        return true;
+    }
+
+    @Override
+    public boolean delete() {
+        return Utils.deleteFile(this.getFile());
     }
 

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

@@ -359 +359 @@
                             .map(ImageEntry.class::cast).map(ImageEntry::getDataSet).distinct().collect(Collectors.toList());
                     for (IImageEntry<?> delete : toDelete) {
-                        if (delete.isRemoveSupported() && delete.remove()) {
+                        // We have to be able to remove the image from the layer and the image from its storage location
+                        // If either are false, then don't remove the image.
+                        if (delete.isRemoveSupported() && delete.isDeleteSupported() && delete.remove() && delete.delete()) {
                             Logging.info("File {0} deleted.", delete.getFile());
                         } else {