Changeset 943 for trunk/src/org/expeditee/gui/FrameKeyboardActions.java

Timestamp:

12/16/14 15:03:11 (9 years ago)

Author:

bln4

Message:

Implementation of IndirectMouseActions. Programmers are now able to intercept actions relating to mouse input events and make them act as they please.

Beginnings of IndirectKeyboardActions...

File:

• trunk/src/org/expeditee/gui/FrameKeyboardActions.java (modified) (3 diffs)

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

@@ -37 +37 @@
 import org.expeditee.actions.Navigation;
 import org.expeditee.actions.Simple;
+import org.expeditee.gui.indirect.keyboard.IndirectKeyboardActions;
+import org.expeditee.gui.indirect.keyboard.KeyboardAction;
+import org.expeditee.gui.indirect.keyboard.KeyboardAction.KeyboardInfo;
 import org.expeditee.io.ItemSelection;
 import org.expeditee.items.Circle;
@@ -60 +63 @@
 
         protected FrameKeyboardActions() {
+                IndirectKeyboardActions.getInstance().setDropDownAction(new KeyboardAction() {
+                        @Override
+                        public void exec(KeyboardInfo info) {
+                                // Get the last text item and drop from in
+                                Item lastText = null;
+                                for (Item i : info.enclosed) {
+                                        if (i instanceof Text) {
+                                                lastText = i;
+                                        }
+                                }
+                                // Drop from the item if there was a text item in the box
+                                if (lastText != null) {
+                                        Drop(lastText, false);
+                                } else {
+                                        // Move to the top of the box
+                                        Rectangle rect = info.firstConnected.getEnclosedShape()
+                                                        .getBounds();
+                                        int newX = rect.x + Text.MARGIN_LEFT;
+                                        int newY = Text.MARGIN_LEFT
+                                                        + rect.y
+                                                        + DisplayIO.getCurrentFrame().getItemTemplate()
+                                                                        .getBoundsHeight();
+                                        moveCursorAndFreeItems(newX, newY);
+                                        // TODO can resetOffset be put inside
+                                        // moveCursorAndFreeItems
+                                        FrameMouseActions.resetOffset();
+                                }
+                        }  
+                });
+                IndirectKeyboardActions.getInstance().setSizeUpAction(new KeyboardAction() {
+                        @Override
+                        public void exec(final KeyboardInfo info) {
+                                SetSize(info.firstConnected, info.repeat, false, true, info.isControlDown);
+                        }               
+                });
+                IndirectKeyboardActions.getInstance().setSizeDownAction(new KeyboardAction() {
+                        @Override
+                        public void exec(final KeyboardInfo info) {
+                                SetSize(info.firstConnected, -info.repeat, false, true, info.isControlDown);
+                        }               
+                });
+                IndirectKeyboardActions.getInstance().setChangeColorAction(new KeyboardAction() {
+                        @Override
+                        public void exec(final KeyboardInfo info) {
+                                if (info.connected.size() > 0) {
+                                        for (Item d : info.lineEnds) {
+                                                if (info.isControlDown)
+                                                        SetGradientColor(d, info.isShiftDown);
+                                                else
+                                                        SetFillColor(d, info.isShiftDown);
+                                                break;
+                                        }
+                                }
+                        } 
+                });
         }
 
@@ -987 +1045 @@
                                 switch (key) {
                                 case DropDown:
-                                        // Get the last text item and drop from in
-                                        Item lastText = null;
-                                        for (Item i : enclosed) {
-                                                if (i instanceof Text) {
-                                                        lastText = i;
-                                                }
-                                        }
-                                        // Drop from the item if there was a text item in the box
-                                        if (lastText != null) {
-                                                Drop(lastText, false);
-                                        } else {
-                                                // Move to the top of the box
-                                                Rectangle rect = firstConnected.getEnclosedShape()
-                                                                .getBounds();
-                                                int newX = rect.x + Text.MARGIN_LEFT;
-                                                int newY = Text.MARGIN_LEFT
-                                                                + rect.y
-                                                                + DisplayIO.getCurrentFrame().getItemTemplate()
-                                                                                .getBoundsHeight();
-                                                moveCursorAndFreeItems(newX, newY);
-                                                // TODO can resetOffset be put inside
-                                                // moveCursorAndFreeItems
-                                                FrameMouseActions.resetOffset();
-                                        }
+                                        IndirectKeyboardActions.getInstance().getDropDownAction().exec(
+                                                        new KeyboardInfo(key, repeat, isShiftDown, isControlDown, enclosed, firstConnected, connected, lineEnds));
                                         break;
                                 case SizeUp:
-                                        SetSize(firstConnected, repeat, false, true, isControlDown);
+                                        IndirectKeyboardActions.getInstance().getSizeUpAction().exec(
+                                                        new KeyboardInfo(key, repeat, isShiftDown, isControlDown, enclosed, firstConnected, connected, lineEnds));
                                         break;
                                 case SizeDown:
-                                        SetSize(firstConnected, -repeat, false, true, isControlDown);
+                                        IndirectKeyboardActions.getInstance().getSizeDownAction().exec(
+                                                        new KeyboardInfo(key, repeat, isShiftDown, isControlDown, enclosed, firstConnected, connected, lineEnds));
                                         break;
                                 case ChangeColor:
-                                        if (connected.size() > 0) {
-                                                for (Item d : lineEnds) {
-                                                        if (isControlDown)
-                                                                SetGradientColor(d, isShiftDown);
-                                                        else
-                                                                SetFillColor(d, isShiftDown);
-                                                        break;
-                                                }
-                                        }
+                                        IndirectKeyboardActions.getInstance().getChangeColorAction().exec(
+                                                        new KeyboardInfo(key, repeat, isShiftDown, isControlDown, enclosed, firstConnected, connected, lineEnds));
                                         break;
                                 case ToggleAnnotation: