Merge remote-tracking branch 'origin/develop' into 1293_PowerUps

# Conflicts:
#	src/main/resources/views/RaceView.fxml

src/main/java/seng302/visualiser/controllers/ServerListController.java

@@ -7,6 +7,7 @@ import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ResourceBundle;
@@ -27,6 +28,7 @@ import seng302.utilities.Sounds;
 import seng302.visualiser.ServerListener;
 import seng302.visualiser.ServerListenerDelegate;
 import seng302.visualiser.controllers.cells.ServerCell;
+import seng302.visualiser.controllers.dialogs.ServerCreationController;
 import seng302.visualiser.validators.HostNameFieldValidator;
 import seng302.visualiser.validators.NumberRangeValidator;
 import seng302.visualiser.validators.ValidationTools;
@@ -55,6 +57,14 @@ public class ServerListController implements Initializable, ServerListenerDelega
 
     private Label noServersFound;
     private Logger logger = LoggerFactory.getLogger(ServerListController.class);
+    private JFXDialog serverCreationDialog;
+    private List<ServerCreationDialogListener> serverCreationDialogListeners = new ArrayList<>();
+
+    @FunctionalInterface
+    public interface ServerCreationDialogListener {
+
+        void notifyClosure();
+    }
 
     // TODO: 12/09/17 ajm412: break this method down, its way too long.
     @Override
@@ -115,6 +125,8 @@ public class ServerListController implements Initializable, ServerListenerDelega
         serverListHostButton.setOnAction(action -> {
             showServerCreationDialog();
         });
+
+        addServerCreationDialogListener(this::closeServerCreationDialog);
     }
 
     /**
@@ -125,9 +137,11 @@ public class ServerListController implements Initializable, ServerListenerDelega
             FXMLLoader dialogContent = new FXMLLoader(getClass().getResource(
                 "/views/dialogs/ServerCreationDialog.fxml"));
             try {
-                JFXDialog dialog = new JFXDialog(serverListMainStackPane, dialogContent.load(),
+                serverCreationDialog = new JFXDialog(serverListMainStackPane, dialogContent.load(),
                     DialogTransition.CENTER);
-                dialog.show();
+                ServerCreationController serverCreationController = dialogContent.getController();
+                serverCreationController.setListener(serverCreationDialogListeners);
+                serverCreationDialog.show();
                 Sounds.playButtonClick();
             } catch (IOException e) {
                 logger.warn("Could not create Server Creation Dialog.");
@@ -135,6 +149,10 @@ public class ServerListController implements Initializable, ServerListenerDelega
         });
     }
 
+    private void closeServerCreationDialog() {
+        serverCreationDialog.close();
+    }
+
     /**
      * Validates the connection and attempts to connect to a given hostname and port number.
      */
@@ -203,4 +221,14 @@ public class ServerListController implements Initializable, ServerListenerDelega
     public void serverDetected(ServerDescription serverDescription, List<ServerDescription> servers) {
         Platform.runLater(() -> refreshServers(servers));
     }
+
+    private void addServerCreationDialogListener(
+        ServerCreationDialogListener serverCreationDialogListener) {
+        serverCreationDialogListeners.add(serverCreationDialogListener);
+    }
+
+    private void removeServerCreationDialogListener(
+        ServerCreationDialogListener serverCreationDialogListener) {
+        serverCreationDialogListeners.remove(serverCreationDialogListener);
+    }
 }

src/main/java/seng302/visualiser/controllers/ViewManager.java

@@ -102,8 +102,6 @@ public class ViewManager {
             gameClient.stopGame();
             System.exit(0);
         });
-
-        jfxSnackbar = new JFXSnackbar(decorator);
     }
 
     /**
@@ -188,6 +186,7 @@ public class ViewManager {
             }
         });
 
+        jfxSnackbar = new JFXSnackbar(decorator);
     }
 
     /**
@@ -221,6 +220,7 @@ public class ViewManager {
                     .getController();
                 keyBindingDialogController.setGameClient(this.gameClient);
                 keyBindingDialog.show();
+                decorator.requestFocus();
                 Sounds.playButtonClick();
             }
         }

src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java

@@ -71,8 +71,7 @@ public class KeyBindingDialogController implements Initializable {
         buttons = new ArrayList<>();
         Collections.addAll(buttons,
             zoomInbtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
-            viewButton,
+            viewButton, rightButton, leftButton, forwardButton, backwardButton);
-            rightButton, leftButton, forwardButton, backwardButton);
         bindButtonWithAction();
         loadKeyBind();
 
@@ -88,12 +87,10 @@ public class KeyBindingDialogController implements Initializable {
         resetBtn.setOnMouseClicked(event -> {
             gameKeyBind.setToDefault();
             loadKeyBind();
+            showSnackBar("All keys reset!", false);
         });
 
         closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
-
-        keyBindingDialogHeader.setFocusTraversable(true);
-        keyBindingDialogHeader.requestFocus();
     }
 
     /**
@@ -161,6 +158,7 @@ public class KeyBindingDialogController implements Initializable {
             + "-fx-background-color: -fx-pp-front-color; "
             + "-fx-text-fill: -fx-pp-theme-color; "
             + "-fx-font-size: 13;");
+        keyBindingDialogHeader.requestFocus();
     }
 
     /**

src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

@@ -5,14 +5,15 @@ import com.jfoenix.controls.JFXSlider;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.net.URL;
+import java.util.List;
 import java.util.ResourceBundle;
-import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
 import javafx.scene.input.MouseEvent;
 import seng302.gameServer.ServerDescription;
 import seng302.utilities.Sounds;
+import seng302.visualiser.controllers.ServerListController.ServerCreationDialogListener;
 import seng302.visualiser.controllers.ViewManager;
 import seng302.visualiser.validators.FieldLengthValidator;
 import seng302.visualiser.validators.ValidationTools;
@@ -28,8 +29,12 @@ public class ServerCreationController implements Initializable {
     private Label maxPlayersLabel;
     @FXML
     private JFXButton submitBtn;
+    @FXML
+    private Label closeLabel;
     //---------FXML END---------//
 
+    private List<ServerCreationDialogListener> serverCreationDialogListeners;
+
     public void initialize(URL location, ResourceBundle resources) {
         updateMaxPlayerLabel();
         maxPlayersSlider.valueProperty().addListener((observable, oldValue, newValue) -> {
@@ -49,6 +54,7 @@ public class ServerCreationController implements Initializable {
             validateServerSettings();
         });
 
+        closeLabel.setOnMouseClicked(event -> notifyListeners());
     }
 
     /**
@@ -87,4 +93,14 @@ public class ServerCreationController implements Initializable {
         Sounds.playHoverSound();
     }
 
+    public void setListener(List<ServerCreationDialogListener> serverCreationDialogListeners) {
+        this.serverCreationDialogListeners = serverCreationDialogListeners;
+    }
+
+    public void notifyListeners() {
+        for (ServerCreationDialogListener serverCreationDialogListener : serverCreationDialogListeners) {
+            serverCreationDialogListener.notifyClosure();
+        }
+    }
+
 }

src/main/resources/css/dialogs/ServerCreation.css

@@ -45,3 +45,13 @@
 .maxPlayers {
     -fx-font-size: 13px;
 }
+
+#closeLabel {
+    -fx-font-size: 30;
+    -fx-text-fill: -fx-pp-dark-text-color;
+}
+
+#closeLabel:hover {
+    -fx-text-fill: red;
+    -fx-font-size: 33px;
+}

src/main/resources/views/RaceView.fxml

@@ -16,7 +16,6 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.Pane?>
@@ -26,7 +25,7 @@
 
 <StackPane fx:id="contentStackPane" maxHeight="1.7976931348623157E308"
   maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
-  prefWidth="1200.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8"
+  prefWidth="1200.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8.0.111"
   xmlns:fx="http://javafx.com/fxml/1"
   fx:controller="seng302.visualiser.controllers.RaceViewController">
     <children>
@@ -128,15 +127,16 @@
                             </rowConstraints>
                             <children>
                                 <JFXButton fx:id="chatSend" alignment="CENTER" buttonType="RAISED"
-                                  maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
+                                  focusTraversable="false" maxHeight="-Infinity"
-                                  minHeight="-Infinity" minWidth="-Infinity" prefHeight="35.0"
+                                  maxWidth="1.7976931348623157E308" minHeight="-Infinity"
-                                  text="SEND" GridPane.columnIndex="1">
+                                  minWidth="-Infinity" prefHeight="35.0" text="SEND"
+                                  GridPane.columnIndex="1">
                                     <GridPane.margin>
                                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                                     </GridPane.margin>
                                 </JFXButton>
-                                <JFXTextField fx:id="chatInput" maxHeight="35.0"
+                                <JFXTextField fx:id="chatInput" focusTraversable="false"
-                                  minHeight="-Infinity" prefHeight="35.0">
+                                  maxHeight="35.0" minHeight="-Infinity" prefHeight="35.0">
                                     <GridPane.margin>
                                         <Insets bottom="10.0" left="20.0" right="10.0"/>
                                     </GridPane.margin>

src/main/resources/views/dialogs/ServerCreationDialog.fxml

@@ -4,14 +4,18 @@
 <?import com.jfoenix.controls.JFXDialogLayout?>
 <?import com.jfoenix.controls.JFXSlider?>
 <?import com.jfoenix.controls.JFXTextField?>
-<?import java.lang.String?>
+<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="550.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.dialogs.ServerCreationController">
+
+<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+  minWidth="-Infinity" prefWidth="550.0" xmlns="http://javafx.com/javafx/8.0.111"
+  xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="seng302.visualiser.controllers.dialogs.ServerCreationController">
     <children>
         <GridPane>
             <columnConstraints>
@@ -59,11 +63,13 @@
                    </VBox>
                </children>
             </GridPane>
+                <Label fx:id="closeLabel" text="✖" GridPane.halignment="RIGHT"
+                  GridPane.valignment="TOP"/>
             </children>
         </GridPane>
     </children>
    <stylesheets>
-       <String fx:value="/css/dialogs/ServerCreation.css" />
+       <URL value="@../../css/dialogs/ServerCreation.css"/>
-       <String fx:value="/css/Master.css"/>
+       <URL value="@../../css/Master.css"/>
    </stylesheets>
 </JFXDialogLayout>