Merged with develop. Fixed many bugs in Visualiser.

#bugs

src/main/java/seng302/gameServer/GameState.java

@@ -2,10 +2,11 @@ package seng302.gameServer;
 
 import java.util.*;
 
-import seng302.models.Player;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import seng302.model.Player;
-
-import seng302.models.Yacht;
+import seng302.model.Yacht;
+import seng302.model.stream.packets.StreamPacket;
 import seng302.server.messages.BoatActionType;
 
 /**
@@ -23,14 +24,26 @@ public class GameState {
     private static Map<Integer, Yacht> yachts;
     private static Boolean isRaceStarted;
     private static GameStages currentStage;
-    
+
+    // TODO: 26/07/17 cir27 - Super hackish fix until something more permanent can be made.
+    private static ObservableList<String> observablePlayers = FXCollections.observableArrayList();
+    private static Map<Player, String> playerStringMap = new HashMap<>();
+    /*
+        Ideally I would like to make this class an object instantiated by the server and given to
+        it's created threads if necessary. Outside of that I think the dependencies on it
+        (atm only Yacht & GameClient) can be removed from most other classes. The observable list of
+        players could be pulled directly from the server by the GameClient since it instantiates it
+        and it is reasonable for it to pull data. The current setup of publicly available statics is
+        pretty meh IMO because anything can change it making it unreliable and like people did with
+        the old ServerParser class everything that needs shared just gets thrown in the static
+        collections and things become a real mess.
+     */
+
     public GameState(String hostIpAddress) {
         windDirection = 170d;
         windSpeed = 10000d;
         yachts = new HashMap<>();
         players = new ArrayList<>();
-
-
         GameState.hostIpAddress = hostIpAddress;
         players = new ArrayList<>();
         currentStage = GameStages.LOBBYING;
@@ -48,13 +61,22 @@ public class GameState {
     public static List<Player> getPlayers() {
         return players;
     }
-    
+
+    public static ObservableList<String> getObservablePlayers () {
+        return observablePlayers;
+    }
+
     public static void addPlayer(Player player) {
         players.add(player);
+        String playerText = player.getYacht().getSourceId() + " " + player.getYacht().getBoatName() + " " + player.getYacht().getCountry();
+        observablePlayers.add(playerText);
+        playerStringMap.put(player, playerText);
     }
     
     public static void removePlayer(Player player) {
         players.remove(player);
+        observablePlayers.remove(playerStringMap.get(player));
+        playerStringMap.remove(player);
     }
 
     public static void addYacht(Integer sourceId, Yacht yacht) {

src/main/java/seng302/gameServer/MainServerThread.java

@@ -2,16 +2,14 @@ package seng302.gameServer;
 
 import java.time.LocalDateTime;
 import java.util.Observable;
-import seng302.client.ClientPacketParser;
-import seng302.models.Player;
-import seng302.models.stream.PacketBufferDelegate;
-import seng302.models.stream.packets.StreamPacket;
-
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.concurrent.PriorityBlockingQueue;
+import seng302.model.Player;
+import seng302.model.stream.PacketBufferDelegate;
+import seng302.model.stream.packets.StreamPacket;
 
 /**
  * A class describing the overall server, which creates and collects server threads for each client
@@ -84,7 +82,7 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
             while (!packetBuffer.isEmpty()){
                 try {
                     StreamPacket packet = packetBuffer.take();
-                    ClientPacketParser.parsePacket(packet);
+//                    ClientPacketParser.parsePacket(packet);
                 } catch (InterruptedException e) {
                     continue;
                 }
@@ -159,4 +157,16 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
             serverToClientThread.sendRaceStatusMessage();
         }
     }
+
+    public void shutDown() {
+        for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+            try {
+                serverToClientThread.getSocket().close();
+            } catch (IOException ioe) {
+                serverLog("Failed to close socket " + serverToClientThread.getSocket().toString(), 0);
+            }
+        }
+        serverToClientThreads = null;
+        thread = null;
+    }
 }

src/main/java/seng302/gameServer/ServerPacketParser.java

@@ -1,7 +1,7 @@
 package seng302.gameServer;
 
 import java.util.Arrays;
-import seng302.models.stream.packets.StreamPacket;
+import seng302.model.stream.packets.StreamPacket;
 import seng302.server.messages.BoatActionType;
 
 

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -12,35 +12,26 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
-import java.util.Random;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
-import org.apache.commons.io.IOUtils;
-import seng302.models.Player;
-import seng302.models.Yacht;
-import seng302.models.stream.packets.PacketType;
-import seng302.models.stream.packets.StreamPacket;
-import seng302.models.xml.Race;
-import seng302.models.xml.Regatta;
-import seng302.models.xml.XMLGenerator;
+import seng302.model.Player;
+import seng302.model.Yacht;
+import seng302.model.stream.packets.PacketType;
+import seng302.model.stream.packets.StreamPacket;
+import seng302.model.stream.xml.generator.Race;
+import seng302.model.stream.xml.generator.Regatta;
+import seng302.model.stream.xml.generator.XMLGenerator;
 import seng302.server.messages.BoatActionType;
 import seng302.server.messages.BoatLocationMessage;
 import seng302.server.messages.BoatStatus;
 import seng302.server.messages.BoatSubMessage;
 import seng302.server.messages.Message;
 
-import java.io.*;
-import java.net.Socket;
-import java.util.zip.CRC32;
-import java.util.zip.Checksum;
 import seng302.server.messages.RaceStatus;
 import seng302.server.messages.RaceStatusMessage;
 import seng302.server.messages.RaceType;
 import seng302.server.messages.XMLMessage;
 import seng302.server.messages.XMLMessageSubType;
-import seng302.server.messages.XMLMessage;
-import seng302.server.messages.XMLMessageSubType;
-import seng302.utilities.GeoPoint;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on
@@ -153,7 +144,7 @@ public class ServerToClientThread implements Runnable, Observer {
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
                         //System.out.println("RECEIVED A PACKET");
-                        switch (PacketType.assignPacketType(type)) {
+                        switch (PacketType.assignPacketType(type, payload)) {
                             case BOAT_ACTION:
                                 BoatActionType actionType = ServerPacketParser
                                     .extractBoatAction(
@@ -306,7 +297,7 @@ public class ServerToClientThread implements Runnable, Observer {
                     yacht.getLocation().getLat(),
                     yacht.getLocation().getLng(),
                     yacht.getHeading(),
-                    (long) yacht.getVelocity());
+                    yacht.getVelocity().longValue());
 
             sendMessage(boatLocationMessage);
         }