Changeset 1502 for trunk

Timestamp:

01/21/20 09:49:32 (4 years ago)

Author:

bnemhaus

Message:

org.expeditee.gio.gesture.ExpediteeKBMGestureTranslator ->
org.expeditee.gio.gesture.StandardGestureActions ->
org.expeditee.gui.Frame ->
org.expeditee.gui.ItemsList ->

Added debug gesutre that prints out body, primary and surrogates before and after a reparse. Ran with command Ctrl + Shift + R

Location:

trunk/src/org/expeditee

Files:

• gio/gesture/ExpediteeKBMGestureTranslator.java (modified) (2 diffs)
• gio/gesture/StandardGestureActions.java (modified) (4 diffs)
• gui/Frame.java (modified) (1 diff)
• gui/ItemsList.java (modified) (1 diff)

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

@@ -1268 +1268 @@
                                 }
                                 
+                                // CTRL + SHIFT + R is the reparse frame body event
+                                if (kbmTranslator.isKeyDown(Key.SHIFT)) {
+                                        return null;
+                                }
+                                
                                 // Must be pressing R to justify
                                 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.R) {
@@ -1275 +1280 @@
                                 // Return the gesture
                                 return Gesture.single(StandardGestureActions.getInstance().gestureType(StandardGestureType.JUSTIFY), new JustifyGestureData(true));
+                        }
+                });
+                
+                // Add the CTRL + SHIFT + R -> REPARSE FRAME BODY gesture recogniser
+                addTranslator(new InputEventToGestureTranslator(InputType.KBM)
+                {
+                        @Override
+                        public String details() { return "CTRL + SHIFT + R -> REPARSE FRAME BODY"; }
+
+                        @Override
+                        public List<Gesture> onInputEvent(InputEvent event) {
+                                // Cast to keyboard/mouse event
+                                KBMInputEvent kbmEvent = (KBMInputEvent) event;
+                                
+                                // Check that ctrl is down
+                                if (!kbmTranslator.isKeyDown(Key.CTRL)) {
+                                        return null;
+                                }
+                                
+                                // CTRL + SHIFT + R is the reparse frame body event
+                                if (!kbmTranslator.isKeyDown(Key.SHIFT)) {
+                                        return null;
+                                }
+                                
+                                // Must be pressing R to justify
+                                if (kbmEvent.getKeyDown() != KBMInputEvent.Key.R) {
+                                        return null;
+                                }
+                                
+                                // Return the gesture
+                                return Gesture.single(StandardGestureActions.getInstance().gestureType(StandardGestureType.REPARSE), null);
                         }
                 });

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;
@@ -59 +58 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
+import org.expeditee.gui.ItemsList;
 import org.expeditee.gui.MessageBay;
-import org.expeditee.gui.ItemsList;
 import org.expeditee.gui.Vector;
 import org.expeditee.io.ExpClipReader;
@@ -133 +132 @@
                 UNDO, 
                 ZOOM, 
-                ACTIVATE_BUTTON // Enter while over Item with _acceptsKeyboardEnter set to true
+                ACTIVATE_BUTTON, // Enter while over Item with _acceptsKeyboardEnter set to true
+                REPARSE // Ctrl + Shift + R
         }
         //@formatter:on
@@ -467 +467 @@
                                 }
                         }
+                });
+                
+                // Set the REPARSE FRAME BODY action
+                setGestureAction(gestureType(StandardGestureType.REPARSE), new GestureAction() {
+                        @Override
+                        public void exec(Gesture gesture) {
+                                Frame currentFrame = DisplayController.getCurrentFrame();
+                                ItemsList body = currentFrame.getBody(false);
+                                ItemsList primaryBody = currentFrame.getPrimaryBody();
+                                ItemsList surrogateBody = currentFrame.getSurrogateBody();
+                                MessageBay.displayMessage("Body:" + body.toString());
+                                MessageBay.displayMessage("Primaries:" + primaryBody.toString());
+                                MessageBay.displayMessage("Surrogates:" + surrogateBody.toString());
+                                currentFrame.parse();
+                                MessageBay.displayMessage("Body:" + body.toString());
+                                MessageBay.displayMessage("Primaries:" + primaryBody.toString());
+                                MessageBay.displayMessage("Surrogates:" + surrogateBody.toString());
+                        } 
+                        
                 });
 

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

@@ -3133 +3133 @@
                 return _primaryItemsBody;
         }
-        protected ItemsList getSurrogateBody() {
+        public ItemsList getSurrogateBody() {
                 return _surrogateItemsBody;
         }

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

@@ -99 +99 @@
                 items.clear();
         }
+        
+        @Override
+        public String toString() {
+                StringBuilder sb = new StringBuilder("{");
+                
+                if (!items.isEmpty()) {
+                        for (Item i : items) {
+                                sb.append(i + ", ");
+                        }
+                        sb.deleteCharAt(sb.length() - 1);
+                        sb.deleteCharAt(sb.length() - 1);
+                }
+                
+                sb.append("}");
+                return sb.toString();
+        }
 }