Changeset 1122 for trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

Timestamp:

09/13/18 12:21:24 (6 years ago)

Author:

bln4

Message:

org.expeditee.gio.gesture.StandardGestureActions ->

Implemented undelete as a special case of delete.

File:

• trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java (modified) (7 diffs)

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

@@ -19 +19 @@
 import org.expeditee.core.Point;
 import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.ClipboardManager.ClipboardData;
 import org.expeditee.gio.EcosystemManager;
-import org.expeditee.gio.ClipboardManager.ClipboardData;
 import org.expeditee.gio.gesture.Gesture.GestureType;
 import org.expeditee.gio.gesture.data.ChangeColourGestureData;
@@ -32 +32 @@
 import org.expeditee.gio.gesture.data.JustifyGestureData;
 import org.expeditee.gio.gesture.data.LinkGestureData;
-import org.expeditee.gio.gesture.data.SelectAreaGestureData;
 import org.expeditee.gio.gesture.data.NavigateFrameGestureData;
 import org.expeditee.gio.gesture.data.NavigateTextGestureData;
@@ -39 +38 @@
 import org.expeditee.gio.gesture.data.RefreshGestureData;
 import org.expeditee.gio.gesture.data.ScaleGestureData;
+import org.expeditee.gio.gesture.data.SelectAreaGestureData;
 import org.expeditee.gio.gesture.data.UndoGestureData;
 import org.expeditee.gio.gesture.data.ZoomGestureData;
+import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.gio.input.StandardInputEventListeners;
-import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.AttributeValuePair;
@@ -62 +62 @@
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
+import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
@@ -73 +74 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
-import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.settings.experimental.ExperimentalFeatures;
 import org.expeditee.settings.templates.TemplateSettings;
@@ -302 +302 @@
                         public void exec(Gesture gesture) {
                                 DeleteGestureData data = (DeleteGestureData) gesture.getData();
-                                delete(data.getCurrentItem(), data.getCurrentItems(), data.getEnclosure(), data.getAlternateMode());
+                                if(FreeItems.getInstance().isEmpty() && data.getCurrentItem() == null && data.getCurrentItems() == null && data.getEnclosure() == null) {
+                                        final Gesture undoGesture = data.getAlternateMode() ? 
+                                                        new Gesture(StandardGestureActions.getInstance().gestureType(StandardGestureType.UNDO), new UndoGestureData(true)) :
+                                                        new Gesture(StandardGestureActions.getInstance().gestureType(StandardGestureType.UNDO), new UndoGestureData(false));
+                                        getGestureAction(gestureType(StandardGestureType.UNDO)).exec(undoGesture);
+                                } else {
+                                        delete(data.getCurrentItem(), data.getCurrentItems(), data.getEnclosure(), data.getAlternateMode());
+                                }       
                         }
                 });
@@ -622 +629 @@
                                         }
                                 } else {
+//                                      System.err.println("PICK_UP (Drag) Action");
                                         Item item = data.getCurrentItem();
                                         if  (item instanceof Text) {