Merge remote-tracking branch 'origin/text_chat' into text_chat

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

@@ -303,7 +303,7 @@ public class ClientToServerThread implements Runnable {
         }
     }
 
-    private void closeSocket() {
+    public void closeSocket() {
         try {
             socket.close();
             socketOpen = false;

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

@@ -234,6 +234,7 @@ public class GameClient {
 
     private void parsePackets() {
         while (socketThread.getPacketQueue().peek() != null) {
+            System.out.println("PARSING PACKET");
             StreamPacket packet = socketThread.getPacketQueue().poll();
             switch (packet.getType()) {
                 case RACE_STATUS:
@@ -297,6 +298,8 @@ public class GameClient {
                 case CHATTER_TEXT:
                     Pair<Integer, String> playerIdMessagePair = StreamParser
                         .extractChatterText(packet);
+
+                    System.out.println("playerIdMessagePair = " + playerIdMessagePair);
                     raceView.updateChatHistory(
                         allBoatsMap.get(playerIdMessagePair.getKey()).getColour(),
                         playerIdMessagePair.getValue()
@@ -457,4 +460,9 @@ public class GameClient {
         }
     }
 
+
+    public ClientToServerThread getSocketThread() {
+        return socketThread;
+    }
+
 }