Created a new chat history class that allows for rich formatting of individual messages. Current implementation allows for bold and coloured text only. Has been manually tested. Fixed 3/5 chat command tests.

#implement #test #story[1246]

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

@@ -26,7 +26,6 @@ import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Slider;
-import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
@@ -50,6 +49,7 @@ import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
 import seng302.visualiser.controllers.annotations.ImportantAnnotationDelegate;
 import seng302.visualiser.controllers.annotations.ImportantAnnotationsState;
 import seng302.visualiser.fxObjects.BoatObject;
+import seng302.visualiser.fxObjects.ChatHistory;
 
 /**
  * Controller class that manages the display of a race
@@ -63,7 +63,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     @FXML
     private Button chatSend;
     @FXML
-    private TextArea chatHistory;
+    private Pane chatHistoryHolder;
     @FXML
     private TextField chatInput;
     @FXML
@@ -98,6 +98,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private GameView gameView;
     private RaceState raceState;
 
+    private ChatHistory chatHistory;
+
     private Timeline timerTimeline;
     private Timer timer = new Timer();
     private List<Series<String, Double>> sparkLineData = new ArrayList<>();
@@ -122,9 +124,19 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 chatInput.setText(chatInput.getText().substring(0, CHAT_LIMIT));
             }
         });
-        chatHistory.textProperty().addListener((obs, oldValue, newValue) -> {
-            chatHistory.setScrollTop(Double.MAX_VALUE);
-        });
+        chatHistory = new ChatHistory();
+        chatHistoryHolder.getChildren().addAll(chatHistory);
+        chatHistory.prefWidthProperty().bind(
+            chatHistoryHolder.widthProperty()
+        );
+        chatHistory.prefHeightProperty().bind(
+            chatHistoryHolder.heightProperty()
+        );
+//        chatHistory.setFitToWidth(true);
+//        chatHistory.setFitToHeight(true);
+//        chatHistory.textProperty().addListener((obs, oldValue, newValue) -> {
+//            chatHistory.setScrollTop(Double.MAX_VALUE);
+//        });
     }
 
     public void loadRace (
@@ -136,12 +148,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         this.markers = raceData.getCompoundMarks();
         this.raceState = raceState;
 
-        initializeUpdateTimer();
-        initialiseFPSCheckBox();
-        initialiseAnnotationSlider();
-        initialiseBoatSelectionComboBox();
-        initialiseSparkLine();
-
         raceState.getPlayerPositions().addListener((ListChangeListener<ClientYacht>) c -> {
             while (c.next()) {
                 if (c.wasPermutated()) {
@@ -181,6 +187,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 gameView.enableZoom();
             }
         });
+
+        initializeUpdateTimer();
+        initialiseFPSCheckBox();
+        initialiseAnnotationSlider();
+        initialiseBoatSelectionComboBox();
+        initialiseSparkLine();
     }
 
     /**
@@ -665,7 +677,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
     public void updateChatHistory(Paint playerColour, String newMessage) {
-        Platform.runLater(() -> chatHistory.appendText(newMessage + "\n\n"));
+//        Platform.runLater(() -> chatHistory.appendText(newMessage + "\n\n"));
+        Platform.runLater(() -> chatHistory.addMessage(playerColour, newMessage));
     }
 
 }

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

@@ -10,8 +10,6 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.GridPane;
-import seng302.gameServer.GameState;
 import seng302.visualiser.GameClient;
 
 /**
@@ -23,111 +21,32 @@ public class StartScreenController implements Initializable {
     @FXML
     private TextField ipTextField;
     @FXML
-    private TextField portTextField;
-    @FXML
-    private GridPane startScreen2;
-    @FXML
     private AnchorPane holder;
 
-    GameClient gameClient;
+    private GameClient gameClient;
 
     public void initialize(URL url,  ResourceBundle resourceBundle) {
-//        gameClient = new GameClient(holder);
-    }
-//
-//    /**
-//     * Loads the fxml content into the parent pane
-//     * @param jfxUrl
-//     * @return the controller of the fxml
-//     */
-//    private Object setContentPane(String jfxUrl) {
-//        try {
-//            AnchorPane contentPane = (AnchorPane) startScreen2.getParent();
-//            contentPane.getChildren().removeAll();
-//            contentPane.getChildren().clear();
-//            contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
-//            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource(jfxUrl));
-//            contentPane.getChildren().addAll((Pane) fxmlLoader.load());
-//
-//            return fxmlLoader.getController();
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        return null;
-//    }
 
+    }
 
     /**
-     * ATTEMPTS TO:
-     * Sets up a new game state with your IP address as designated as the host.
-     * Starts a thread to listen for incoming connections.
-     * Starts a client to server thread and connects to own ip.
-     * Switches to the lobby screen
+     * Creates an instance of GameClient and runs it as a host.
      */
     @FXML
     public void hostButtonPressed() {
-//        new GameState(getLocalHostIp());
         gameClient = new GameClient(holder);
         gameClient.runAsHost(getLocalHostIp(), 4942);
-//        try {
-////            String ipAddress = InetAddress.getLocalHost().getHostAddress();
-////            new GameState(ipAddress);
-////            new MainServerThread();
-////            ClientToServerThread clientToServerThread = new ClientToServerThread("localhost", 4950);
-////            controller.setClientToServerThread(clientToServerThread);
-//            // get the lobby controller so that we can pass the game server thread to it
-//            new GameState(getLocalHostIp());
-//            MainServerThread mainServerThread = new MainServerThread();
-////            ClientState.setHost(true);
-//            // host will connect and handshake to itself after setting up the server
-//            // TODO: 24/07/17 wmu16 - Make port number some static global type constant?
-////            ClientToServerThread clientToServerThread = new ClientToServerThread(ClientState.getHostIp(), 4942);
-////            ClientState.setConnectedToHost(true);
-////            controller.setClientToServerThread(clientToServerThread);
-//            LobbyController lobbyController = (LobbyController) setContentPane("/views/LobbyView.fxml");
-//            lobbyController.setMainServerThread(mainServerThread);
-//        } catch (Exception e) {
-//            Alert alert = new Alert(AlertType.ERROR);
-//            alert.setHeaderText("Cannot host");
-//            alert.setContentText("Oops, failed to host, try to restart.");
-//            alert.showAndWait();
-//            e.printStackTrace();
-//        }
     }
 
     /**
-     * ATTEMPTS TO:
-     * Connect to an ip address and port using the ip and port specified on start screen.
-     * Starts a Client To Server Thread to maintain connection to host.
-     * Switch view to lobby view.
+     * Creates an instance of GameClient and runs it has a client.
      */
     @FXML
     public void connectButtonPressed() {
-        // TODO: 10/07/17 wmu16 - Finish function
         gameClient = new GameClient(holder);
         gameClient.runAsClient(ipTextField.getText().trim().toLowerCase(), 4942);
-
-//        try {
-//            String ipAddress = ipTextField.getText().trim().toLowerCase();
-//            Integer port = Integer.valueOf(portTextField.getText().trim());
-//
-////            ClientToServerThread clientToServerThread = new ClientToServerThread(ipAddress, port);
-////            ClientState.setHost(false);
-////            ClientState.setConnectedToHost(true);
-//
-////            controller.setClientToServerThread(clientToServerThread);
-////            setContentPane("/views/LobbyView.fxml");
-//        } catch (Exception e) {
-//            Alert alert = new Alert(AlertType.ERROR);
-//            alert.setHeaderText("Cannot reach the host");
-//            alert.setContentText("Please check your host IP address.");
-//            alert.showAndWait();
-//        }
     }
 
-//    public void setController(Controller controller) {
-//        this.controller = controller;
-//    }
 
     /**
      * Gets the local host ip address and sets this ip to ClientState.
@@ -162,7 +81,6 @@ public class StartScreenController implements Initializable {
         if (ipAddress == null) {
             System.out.println("[HOST] Cannot obtain local host ip address.");
         }
-//        ClientState.setHostIp(ipAddress);
         return ipAddress;
     }
 }