From 0e93be7b36839eb69b029d2e26665b636222789c Mon Sep 17 00:00:00 2001
From: Zhi You Tan <ryan_zhiyou@hotmail.com>
Date: Mon, 25 Sep 2017 17:06:36 +1300
Subject: [PATCH] Fixed send button traversable issue.

 - removed sensitive characters.

#story[1278] #pair[hyi25, zyt10]
---
 src/main/java/seng302/model/GameKeyBind.java              | 3 +--
 .../java/seng302/visualiser/controllers/ViewManager.java  | 2 +-
 .../controllers/dialogs/KeyBindingDialogController.java   | 8 +++++++-
 src/main/resources/css/RaceView.css                       | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/model/GameKeyBind.java b/src/main/java/seng302/model/GameKeyBind.java
index 84ed789e..1c765adc 100644
--- a/src/main/java/seng302/model/GameKeyBind.java
+++ b/src/main/java/seng302/model/GameKeyBind.java
@@ -53,8 +53,7 @@ public class GameKeyBind {
      * @return true if successfully bind
      */
     public boolean bindKeyToAction(KeyCode keyCode, KeyAction keyAction) {
-        if (instance.keyToActionMap.containsKey(keyCode) && !(instance.keyToActionMap.get(keyCode)
-            == keyAction)) {
+        if (instance.keyToActionMap.containsKey(keyCode)) {
             // if the key has been bound to other action, return false
             return false;
         } else {
diff --git a/src/main/java/seng302/visualiser/controllers/ViewManager.java b/src/main/java/seng302/visualiser/controllers/ViewManager.java
index 43f10fb1..8f98824c 100644
--- a/src/main/java/seng302/visualiser/controllers/ViewManager.java
+++ b/src/main/java/seng302/visualiser/controllers/ViewManager.java
@@ -243,7 +243,7 @@ public class ViewManager {
                 decorator.getStylesheets().remove(1);
             }
         }
-        jfxSnackbar.show(snackbarText, "fuck", 1500);
+        jfxSnackbar.show(snackbarText, 1500);
     }
 
     /**
diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java b/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java
index 8b40acea..2a286ec4 100644
--- a/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java
+++ b/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java
@@ -23,6 +23,8 @@ public class KeyBindingDialogController implements Initializable {
 
     //--------FXML BEGIN--------//
     @FXML
+    private Label keyBindingDialogHeader;
+    @FXML
     private Label closeLabel;
     @FXML
     private JFXButton zoomInbtn;
@@ -77,6 +79,9 @@ public class KeyBindingDialogController implements Initializable {
         });
 
         closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
+
+        keyBindingDialogHeader.setFocusTraversable(true);
+        keyBindingDialogHeader.requestFocus();
     }
 
     /**
@@ -153,14 +158,15 @@ public class KeyBindingDialogController implements Initializable {
      * @param button
      */
     private void keyPressed(KeyEvent event, Button button) {
+        event.consume();
         KeyAction buttonAction = buttonActionMap.get(button);
         if (gameKeyBind.bindKeyToAction(event.getCode(), buttonAction)) {
             showSnackBar(button.getId() + " is set to " + event.getCode().getName(), false);
             button.setText(gameKeyBind.getKeyCode(buttonAction).getName());
         } else {
+            loadKeyBind();
             showSnackBar(event.getCode().getName() + " is already in use", true);
         }
-        event.consume();
     }
 
     /**
diff --git a/src/main/resources/css/RaceView.css b/src/main/resources/css/RaceView.css
index 11e8f285..f38216c8 100644
--- a/src/main/resources/css/RaceView.css
+++ b/src/main/resources/css/RaceView.css
@@ -48,6 +48,7 @@ GridPane .timer * {
     -fx-text-fill: -fx-pp-theme-color;
     -fx-font-size: 13px;
     -fx-pref-height: 35px;
+    -fx-focus-traversable: false;
 }
 
 #chatSend:hover {