Changeset 1448 for trunk

Timestamp:

11/12/19 15:39:05 (4 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.

Location:

trunk/src/org/expeditee

Files:

• gio/gesture/StandardGestureActions.java (modified) (5 diffs)
• gui/Frame.java (modified) (2 diffs)

trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

@@ -1 +1 @@
 package org.expeditee.gio.gesture;
 
+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.text.NumberFormat;
 import java.util.ArrayList;
@@ -3245 +3251 @@
                         }
                         Collection<Item> toUndo = null;
+                        List<Path> canditateFilesToDelete = new ArrayList<Path>();
                         if (toDelete.isLineEnd()) {
                                 // delete the entire connected shape if shift is down
@@ -3290 +3297 @@
                                 bRecalculate |= toDelete.recalculateWhenChanged();
                                 toUndo = toDelete.getConnected(); // copy(toDelete.getConnected());
+                                if (toDelete instanceof Picture && alternateMode) {
+                                        String pathStr = ((Picture) toDelete).getPath();
+                                        Path path = Paths.get(pathStr);
+                                        canditateFilesToDelete.add(path);
+                                }
                         }
                         SessionStats.DeletedItems(toUndo);
@@ -3295 +3307 @@
                                 parent.addToUndoDelete(new ItemsList(toUndo));
                                 parent.removeAllItems(toUndo); // toDelete.getConnected()
+                                deleteUnusedFiles(canditateFilesToDelete);
                         }
                         // reset the mouse cursor
@@ -3314 +3327 @@
 
                 DisplayController.requestRefresh(true);
+        }
+
+        private static void deleteUnusedFiles(List<Path> canditateFilesToDelete) {
+                for (Path p: canditateFilesToDelete) {
+                        try {
+                                Path trashPath = Paths.get(FrameIO.TRASH_PATH);
+                                trashPath.toFile().mkdirs();
+                                Path destination = trashPath.resolve(p.getFileName());
+                                Files.move(p, destination, StandardCopyOption.ATOMIC_MOVE);
+                        } catch (IOException e) {
+                                MessageBay.displayMessage("There was a problem moving a file to the trash.  File: " + p.getFileName());
+                        }
+                }
         }
 

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();