keyboard shortcut for Undo, plus gratuitous use of ternary operator

diff --git a/net/systemeD/halcyon/connection/MainUndoStack.as b/net/systemeD/halcyon/connection/MainUndoStack.as
index 5f9790d50d001ceacd9211783c3d860cddd0c0b9..4e7fdb7724148efaf2f792e8de213d88b26fd42e 100644 (file)
--- a/net/systemeD/halcyon/connection/MainUndoStack.as
+++ b/net/systemeD/halcyon/connection/MainUndoStack.as
@@ -68,6 +68,7 @@ package net.systemeD.halcyon.connection {
         }
         
         public function undo():void {
+                       if (!undoActions.length) { return; }
             var action:UndoableAction = undoActions.pop();
             trace("undoing "+action);
             action.undoAction();
@@ -77,6 +78,7 @@ package net.systemeD.halcyon.connection {
         }
         
         public function redo():void {
+                       if (!redoActions.length) { return; }
             var action:UndoableAction = redoActions.pop();
             trace("redoing "+action);
             action.doAction();

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index 23946f433ae37915d7bed52d54fccf830c895a6c..8db5a012612f1ac70d504a4baaa01c1dde12f3fa 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -45,6 +45,13 @@ package net.systemeD.potlatch2.controller {
                        return "(No state)";
                }
                
+               protected function sharedKeyboardEvents(event:KeyboardEvent):ControllerState {
+                       switch (event.keyCode) {
+                               case 90:        MainUndoStack.getGlobalStack().undo(); return null;             // Z
+                       }
+                       return null;
+               }
+               
                protected function sharedMouseEvents(event:MouseEvent, entity:Entity):ControllerState {
                        var paint:MapPaint = getMapPaint(DisplayObject(event.target));
             var focus:Entity = getTopLevelFocusEntity(entity);

diff --git a/net/systemeD/potlatch2/controller/DrawWay.as b/net/systemeD/potlatch2/controller/DrawWay.as
index 1772146b76312ce58b2d0c43be36844858729dda..af1cdeb0a2dea8379be6370290e60ea2821ad343 100644 (file)
--- a/net/systemeD/potlatch2/controller/DrawWay.as
+++ b/net/systemeD/potlatch2/controller/DrawWay.as
@@ -96,7 +96,8 @@ package net.systemeD.potlatch2.controller {
                override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
                        if ( event.keyCode == 13 || event.keyCode == 27 ) { return stopDrawing(); }
                        else if (event.keyCode == Keyboard.BACKSPACE) { return backspaceNode(MainUndoStack.getGlobalStack().addAction); }
-                       return this;
+                       var cs:ControllerState = sharedKeyboardEvents(event);
+                       return cs ? cs : this;
                }
                
                protected function stopDrawing():ControllerState {

diff --git a/net/systemeD/potlatch2/controller/NoSelection.as b/net/systemeD/potlatch2/controller/NoSelection.as
index 83bdb057ea370ecce0b39657686afa2663bd6f80..e40eaa00295c343ddc966b80b4a50ced3f926f62 100644 (file)
--- a/net/systemeD/potlatch2/controller/NoSelection.as
+++ b/net/systemeD/potlatch2/controller/NoSelection.as
@@ -28,8 +28,12 @@ package net.systemeD.potlatch2.controller {
                                return new DrawWay(way, true, false);
                        }
                        var cs:ControllerState = sharedMouseEvents(event, entity);
-                       if (cs) return cs;
-                       return this;
+                       return cs ? cs : this;
+               }
+               
+               override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
+                       var cs:ControllerState = sharedKeyboardEvents(event);
+                       return cs ? cs : this;
                }
                
         override public function enterState():void {

diff --git a/net/systemeD/potlatch2/controller/SelectedPOINode.as b/net/systemeD/potlatch2/controller/SelectedPOINode.as
index 84725631815752415717626fd1cec4e2f1d2e62e..9d158d957ba375e75ce480b02500cab7a068f769 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedPOINode.as
+++ b/net/systemeD/potlatch2/controller/SelectedPOINode.as
@@ -34,8 +34,7 @@ package net.systemeD.potlatch2.controller {
         override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        if (event.type==MouseEvent.MOUSE_MOVE) { return this; }
                        var cs:ControllerState = sharedMouseEvents(event, entity);
-                       if (cs) return cs;
-            return this;
+                       return cs ? cs : this;
         }
 
                override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
@@ -43,7 +42,8 @@ package net.systemeD.potlatch2.controller {
                                case Keyboard.BACKSPACE:        return deletePOI();
                                case Keyboard.DELETE:           return deletePOI();
                        }
-                       return this;
+                       var cs:ControllerState = sharedKeyboardEvents(event);
+                       return cs ? cs : this;
                }
                
                public function deletePOI():ControllerState {

diff --git a/net/systemeD/potlatch2/controller/SelectedWay.as b/net/systemeD/potlatch2/controller/SelectedWay.as
index 7762b7c46c4aeae93793cf87fd77d488b2671868..f7e6d327485b49cb6a123240bd5019791c106ad8 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWay.as
+++ b/net/systemeD/potlatch2/controller/SelectedWay.as
@@ -54,8 +54,7 @@ package net.systemeD.potlatch2.controller {
                                return d;
                        }
                        var cs:ControllerState = sharedMouseEvents(event, entity);
-                       if (cs) return cs;
-                       return this;
+                       return cs ? cs : this;
         }
         
                override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
@@ -68,7 +67,8 @@ package net.systemeD.potlatch2.controller {
                                case Keyboard.BACKSPACE:        if (event.shiftKey) { return deleteWay(); } break;
                                case Keyboard.DELETE:           if (event.shiftKey) { return deleteWay(); } break;
                        }
-                       return this;
+                       var cs:ControllerState = sharedKeyboardEvents(event);
+                       return cs ? cs : this;
                }
 
         protected function addNode(event:MouseEvent):int {

diff --git a/net/systemeD/potlatch2/controller/SelectedWayNode.as b/net/systemeD/potlatch2/controller/SelectedWayNode.as
index 502644b0579547ed2709a3b61fe753111565f4c8..be414df2b4593357620117187d0a05710dd5a7e8 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWayNode.as
+++ b/net/systemeD/potlatch2/controller/SelectedWayNode.as
@@ -56,8 +56,7 @@ package net.systemeD.potlatch2.controller {
                                return d;
                        }
                        var cs:ControllerState = sharedMouseEvents(event, entity);
-                       if (cs) return cs;
-                       return this;
+                       return cs ? cs : this;
         }
 
                override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
@@ -67,7 +66,8 @@ package net.systemeD.potlatch2.controller {
                                case Keyboard.BACKSPACE:        return deleteNode();
                                case Keyboard.DELETE:           return deleteNode();
                        }
-                       return this;
+                       var cs:ControllerState = sharedKeyboardEvents(event);
+                       return cs ? cs : this;
                }
                
                override public function enterState():void {