Changeset 1448 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

11/12/19 15:39:05 (5 years ago)

Author:

bnemhaus

Message:

When deleting a picture on a expedite frame; if shift is held down, then the associated image file is now moved to the trash directory (FrameIO.TRASH_PATH).
When undoing the deletion of a picture, the associated image file is restored.

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Frame.java

@@ -20 +20 @@
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.sql.Time;
 import java.util.ArrayList;
@@ -1096 +1100 @@
                         _redo.push(undo);
                 for(Item i : undo.items) {
+                        if (i instanceof org.expeditee.items.Picture) {
+                                String destination = ((org.expeditee.items.Picture) i).getPath();
+                                Path destinationPath = Paths.get(destination);
+                                Path sourcePath = Paths.get(FrameIO.TRASH_PATH).resolve(destinationPath.getFileName());
+                                try {
+                                                Files.move(sourcePath, destinationPath, StandardCopyOption.ATOMIC_MOVE);
+                                        } catch (IOException e) {
+                                                MessageBay.displayMessage("Unable to restore image file from trash, not undoing deletion of image.");
+                                                continue;
+                                        }
+                        }
                         this.addItem(i);
                                 reparse |= i.hasOverlay();