WIP. Probably need to cherry pick stuff out of here.

Added ClientConnection and server-side handshake.
Added MessageSerialiser and Deserialiser.
#story[1095]

racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java

@@ -144,32 +144,5 @@ public class ConnectionController extends Controller {
         }
     }
 
-    /**
-     * Sets up a new host
-     */
-    public void addLocal() {
-        try {
-            //We don't want to host more than one game.
-            if (!currentlyHostingGame) {
-                Event game = Event.getEvent();
-                urlField.textProperty().set(game.getAddress());
-                portField.textProperty().set(Integer.toString(game.getPort()));
 
-                game.start();
-                addConnection();
-
-                currentlyHostingGame = true;
-            }
-        } catch (InvalidRaceDataException e) {
-            e.printStackTrace();
-        } catch (XMLReaderException e) {
-            e.printStackTrace();
-        } catch (InvalidBoatDataException e) {
-            e.printStackTrace();
-        } catch (InvalidRegattaDataException e) {
-            e.printStackTrace();
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-        }
-    }
 }

racevisionGame/src/main/java/visualiser/Controllers/HostController.java

@@ -6,6 +6,7 @@ import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
 import mock.app.Event;
+import mock.exceptions.EventConstructionException;
 import shared.exceptions.InvalidBoatDataException;
 import shared.exceptions.InvalidRaceDataException;
 import shared.exceptions.InvalidRegattaDataException;
@@ -17,6 +18,8 @@ import java.net.Socket;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Controller for Hosting a game.
@@ -44,17 +47,12 @@ public class HostController extends Controller {
      */
     public void hostGamePressed() throws IOException{
         try {
-            Event game = Event.getEvent();
+            Event game = new Event();
             game.start();
             connectSocket("localhost", 4942);
-        } catch (InvalidRaceDataException e) {
-            e.printStackTrace();
-        } catch (XMLReaderException e) {
-            e.printStackTrace();
-        } catch (InvalidBoatDataException e) {
-            e.printStackTrace();
-        } catch (InvalidRegattaDataException e) {
-            e.printStackTrace();
+        } catch (EventConstructionException e) {
+            Logger.getGlobal().log(Level.SEVERE, "Could not create Event.", e);
+            throw new RuntimeException(e);
         }
     }
 

racevisionGame/src/main/java/visualiser/Controllers/RaceController.java

@@ -26,6 +26,8 @@ import visualiser.model.*;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Controller used to display a running race.
@@ -115,8 +117,9 @@ public class RaceController extends Controller {
                     controllerClient.sendKey(controlKey);
                     controlKey.onAction();  // Change key state if applicable
                     event.consume();
-                } catch (IOException e) {
-                    e.printStackTrace();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    Logger.getGlobal().log(Level.WARNING, "RaceController was interrupted on thread: " + Thread.currentThread() + "while sending: " + controlKey, e);
                 }
             }
         });

racevisionGame/src/main/java/visualiser/Controllers/StartController.java

@@ -20,6 +20,7 @@ import shared.exceptions.InvalidRegattaDataException;
 import shared.exceptions.XMLReaderException;
 import visualiser.app.VisualiserInput;
 import visualiser.gameController.ControllerClient;
+import visualiser.model.ServerConnection;
 import visualiser.model.VisualiserBoat;
 import visualiser.model.VisualiserRace;
 
@@ -27,6 +28,8 @@ import java.io.IOException;
 import java.net.Socket;
 import java.net.URL;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Controller to for waiting for the race to start.
@@ -66,18 +69,18 @@ public class StartController extends Controller implements Observer {
     @FXML private Label raceStatusLabel;
 
 
-
     /**
-     * The object used to read packets from the connected server.
+     * Our connection to the server.
      */
-    private VisualiserInput visualiserInput;
+    private ServerConnection serverConnection;
+
 
     /**
      * The race object which describes the currently occurring race.
      */
     private VisualiserRace visualiserRace;
 
-    private ControllerClient controllerClient;
+
 
     /**
      * An array of colors used to assign colors to each boat - passed in to the VisualiserRace constructor.
@@ -309,17 +312,17 @@ public class StartController extends Controller implements Observer {
     public void enterLobby(Socket socket) {
         startWrapper.setVisible(true);
         try {
-            //Begin reading packets from the socket/server.
-            this.visualiserInput = new VisualiserInput(socket);
-            //Send controller input to server
-            this.controllerClient = new ControllerClient(socket);
+
+            LatestMessages latestMessages = new LatestMessages();
+            this.serverConnection = new ServerConnection(socket, latestMessages);
+
+
             //Store a reference to latestMessages so that we can observe it.
-            LatestMessages latestMessages = this.visualiserInput.getLatestMessages();
             latestMessages.addObserver(this);
-            new Thread(this.visualiserInput).start();
+            new Thread(this.serverConnection).start();
 
         } catch (IOException e) {
-            e.printStackTrace();
+            Logger.getGlobal().log(Level.WARNING, "Could not connection to server.", e);
         }
     }