Fixes a regression caused by f107cdd: Move keys stopped working.

Author: stiangre

Diff for: src/net/sf/freecol/client/gui/Canvas.java

@@ -61,6 +61,7 @@
 import net.sf.freecol.client.ClientOptions;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.gui.SwingGUI.PopupPosition;
+import net.sf.freecol.client.gui.action.FreeColAction;
 import net.sf.freecol.client.gui.dialog.FreeColDialog;
 import net.sf.freecol.client.gui.mapviewer.CanvasMapViewer;
 import net.sf.freecol.client.gui.mapviewer.MapViewer;
@@ -81,6 +82,7 @@
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.option.IntegerOption;
+import net.sf.freecol.common.option.Option;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.resources.Video;
 
@@ -231,6 +233,15 @@ public void componentHidden(ComponentEvent e) {
         setLayout(null);
         setFocusable(true);
         setFocusTraversalKeysEnabled(false);
+        // Create key bindings for all actions
+        for (FreeColAction action  : freeColClient.getActionManager().getFreeColActions()) {
+            if (!action.isCanvasKeyBinding()) {
+                continue;
+            }
+            getInputMap().put(action.getAccelerator(), action.getId());
+            getActionMap().put(action.getId(), action);
+        }
+
 
         this.parentFrame.setVisible(true);
 

Diff for: src/net/sf/freecol/client/gui/action/ActionManager.java

@@ -20,7 +20,7 @@
 package net.sf.freecol.client.gui.action;
 
 import java.util.logging.Logger;
-
+import java.util.stream.Collectors;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -212,6 +212,17 @@ public FreeColAction getFreeColAction(String id) {
             ? getOption(id, FreeColAction.class)
             : null;
     }
+    
+    /***
+     * Gets all registered {@code FreeColAction}s.
+     * @return The list of all actions.
+     */
+    public List<FreeColAction> getFreeColActions() {
+        return getOptions().stream()
+                .filter(o -> o instanceof FreeColAction)
+                .map(o -> (FreeColAction) o)
+                .collect(Collectors.toList());
+    }
 
     /**
      * Updates every {@code FreeColAction} this object keeps.

Diff for: src/net/sf/freecol/client/gui/action/FreeColAction.java

@@ -118,6 +118,7 @@ public void menuKeyTyped(MenuKeyEvent e) {
 
     private int orderButtonImageCount = 0;
     private List<String> imageIconKeys = new ArrayList<>();
+    private boolean canvasKeyBinding = false;
 
     /**
      * Creates a new {@code FreeColAction}.
@@ -416,6 +417,24 @@ public String getEnabledBy() {
         /* FreeColAction cannot be enabled/disabled by other options. */
         return null;
     }
+    
+    /**
+     * Checks if this action should have its accelerator key added to the {@code Canvas}.
+     * @return {@code true} if the accelerator key should be added to the {@code Canvas}. This
+     *      is typically used when this action is not used in any menu.
+     */
+    public boolean isCanvasKeyBinding() {
+        return canvasKeyBinding;
+    }
+    
+    /**
+     * Defines if this action should have its accelerator key added to the {@code Canvas}.
+     * @param canvasKeyBinding {@code true} if the accelerator key should be added to the
+     *      {@code Canvas}. This is typically used when this action is not used in any menu.
+     */
+    public void setCanvasKeyBinding(boolean canvasKeyBinding) {
+        this.canvasKeyBinding = canvasKeyBinding;
+    }
 
 
     // Serialization

Diff for: src/net/sf/freecol/client/gui/action/MoveAction.java

@@ -47,6 +47,8 @@ public MoveAction(FreeColClient freeColClient, Direction direction) {
         super(freeColClient, id + direction);
 
         this.direction = direction;
+        
+        setCanvasKeyBinding(true);
     }
 
     /**