Changeset 1450 for trunk

Timestamp:

11/13/19 15:15:33 (4 years ago)

Author:

bnemhaus

Message:

Fixed bug I introduced in the delete image file on delete expeditee picture. Bug was causing issues with non-shift delete of pictures, this is fixed now.

Location:

trunk/src/org/expeditee

Files:

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

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

@@ -1982 +1982 @@
                 // the current frame as well as the overlay frame
                 Frame currentFrame = DisplayController.getCurrentFrame();
-                currentFrame.addToUndoDelete(new ItemsList(itemList));
+                currentFrame.addToUndoDelete(new ItemsList(itemList), false);
                 itemList.clear();
                 if (bReparse) {
@@ -3305 +3305 @@
                         SessionStats.DeletedItems(toUndo);
                         if (parent != null) {
-                                parent.addToUndoDelete(new ItemsList(toUndo));
+                                parent.addToUndoDelete(new ItemsList(toUndo), !canditateFilesToDelete.isEmpty());
                                 parent.removeAllItems(toUndo); // toDelete.getConnected()
                                 deleteUnusedFiles(canditateFilesToDelete);

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

@@ -1064 +1064 @@
         /**
          * Adds the given History event to the stack.
-         * 
-         * @param stack The stack to add to
          * @param items The items to put in the event
          * @param type  The type of event that occurred
-         */
-        private void addToUndo(ItemsList items, History.Type type) {
+         * @param undoDeleteAssociatedFiles TODO
+         * @param stack The stack to add to
+         */
+        private void addToUndo(ItemsList items, History.Type type, boolean undoDeleteAssociatedFiles) {
                 if (items.size() < 1) {
                         return;
                 }
 
-                _undo.push(new History(items, type));
-        }
-        
-        public void addToUndoDelete(ItemsList items) {
-                addToUndo(items, History.Type.deletion);
+                _undo.push(new History(items, type, undoDeleteAssociatedFiles));
+        }
+        
+        public void addToUndoDelete(ItemsList items, boolean undoDeleteAssociatedFiles) {
+                addToUndo(items, History.Type.deletion, undoDeleteAssociatedFiles);
         }
         
         public void addToUndoMove(ItemsList items) {
-                addToUndo(items, History.Type.movement);
+                addToUndo(items, History.Type.movement, false);
         }
 
@@ -1101 +1101 @@
                         _redo.push(undo);
                 for(Item i : undo.items) {
-                        if (i instanceof org.expeditee.items.Picture) {
+                        if (i instanceof org.expeditee.items.Picture && undo.undoDeleteAssociatedFiles) {
                                 String destination = ((Picture) i).getPath();
                                 Path destinationPath = Paths.get(destination);
@@ -1128 +1128 @@
                         ItemsList changed = new ItemsList(body);
                         changed.retainAll(undo.items);
-                        _redo.push(new History(changed, History.Type.movement));
+                        _redo.push(new History(changed, History.Type.movement, false));
                         for(Item i : undo.items) {
                                 int index;
@@ -1190 +1190 @@
                         ItemsList changed = new ItemsList(body);
                         changed.retainAll(redo.items);
-                        _undo.push(new History(changed, History.Type.movement));
+                        _undo.push(new History(changed, History.Type.movement, false));
                         for(Item i : redo.items) {
                                 int index;
@@ -1834 +1834 @@
                 
                 _body.removeAll(newBody);
-                addToUndoDelete(_body);
+                addToUndoDelete(_body, false);
                 _body = newBody;
                 change();
@@ -1865 +1865 @@
                 }
                 
-                addToUndoDelete(deleted);
+                addToUndoDelete(deleted, false);
                 change();
                 
@@ -3019 +3019 @@
                 
                 public final Type type;
-                
-                public History(ItemsList changed, Type type)
+
+                public final boolean undoDeleteAssociatedFiles;
+                
+                public History(ItemsList changed, Type type, boolean undoDeleteAssociatedFiles)
                 {
+                        this.undoDeleteAssociatedFiles = undoDeleteAssociatedFiles;
                         this.items = new ItemsList(changed);
                         this.type = type;