chat packets sent to server and then sent back to all clients. #story[1246]

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -288,7 +288,7 @@ public class ClientToServerThread implements Runnable {
     }
 
     public void sendChatterMessage(String message) {
-        sendByteBuffer(new ChatterMessage(5, message).getBuffer());
+        sendByteBuffer(new ChatterMessage(clientId, message).getBuffer());
     }
 
     private void sendByteBuffer(byte[] bytes) {

src/main/java/seng302/visualiser/GameClient.java

@@ -1,8 +1,12 @@
 package seng302.visualiser;
 
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
 import javafx.application.Platform;
@@ -15,6 +19,7 @@ import javafx.scene.control.Alert.AlertType;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
+import javafx.util.Pair;
 import seng302.gameServer.GameState;
 import seng302.gameServer.MainServerThread;
 import seng302.gameServer.messages.BoatAction;
@@ -198,12 +203,13 @@ public class GameClient {
         raceView.loadRace(allBoatsMap, courseData, raceState, player);
         raceView.getSendPressedProperty().addListener((obs, old, isPressed) -> {
             if (isPressed) {
-                socketThread.sendChatterMessage(raceView.readChatInput());
+                formatAndSendChatMessage(raceView.readChatInput());
             }
         });
     }
 
 
+
     private void loadFinishScreenView() {
         FXMLLoader fxmlLoader = loadFXMLToHolder("/views/FinishScreenView.fxml");
         FinishScreenViewController controller = fxmlLoader.getController();
@@ -287,6 +293,14 @@ public class GameClient {
                 case YACHT_EVENT_CODE:
                     showCollisionAlert(StreamParser.extractYachtEventCode(packet));
                     break;
+
+                case CHATTER_TEXT:
+                    Pair<Integer, String> playerIdMessagePair = StreamParser
+                        .extractChatterText(packet);
+                    raceView.updateChatHistory(
+                        allBoatsMap.get(playerIdMessagePair.getKey()).getColour(),
+                        playerIdMessagePair.getValue()
+                    );
             }
         }
     }
@@ -382,7 +396,7 @@ public class GameClient {
     private void keyPressed(KeyEvent e) {
         if (raceView.isChatInputFocused()) {
             if (e.getCode() == KeyCode.ENTER) {
-                socketThread.sendChatterMessage(raceView.readChatInput());
+                formatAndSendChatMessage(raceView.readChatInput());
             }
             return;
         }
@@ -433,4 +447,14 @@ public class GameClient {
             );
         }
     }
+
+    private void formatAndSendChatMessage(String rawChat) {
+        if (rawChat.length() > 0) {
+            socketThread.sendChatterMessage(
+                new SimpleDateFormat("[HH:mm:ss] ").format(new Date()) +
+                    allBoatsMap.get(socketThread.getClientId()).getShortName() + ": " + rawChat
+            );
+        }
+    }
+
 }

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

@@ -57,6 +57,8 @@ import seng302.visualiser.fxObjects.BoatObject;
  */
 public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
+    private final int CHAT_LIMIT = 128;
+
     @FXML
     private Pane basePane;
     @FXML
@@ -113,10 +115,14 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         raceSparkLine.visibleProperty().setValue(false);
         raceSparkLine.getYAxis().setAutoRanging(false);
         sparklineYAxis.setTickMarkVisible(false);
-
         positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
 
         selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
+        chatInput.lengthProperty().addListener((obs, oldLen, newLen) -> {
+            if (newLen.intValue() > CHAT_LIMIT) {
+                chatInput.setText(chatInput.getText().substring(0, CHAT_LIMIT));
+            }
+        });
     }
 
     public void loadRace (
@@ -650,9 +656,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return chat;
     }
 
-//    @FXML
-//    public void onSendAction() {
-//
-//        chatHistory.setText(chatHistory.getText() + chatInput.getText() + '\n');
-//    }
+    public void updateChatHistory(Paint playerColour, String newMessage) {
+        chatHistory.setText(chatHistory.getText() + newMessage + '\n');
+    }
+
 }