Rather than a high frequency loop sending all packets a low frequency loop is made then destroyed on button press for sending turn packets. This means a fast response time on button press but fewer packets sent.

#implement #issue[38]

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

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import seng302.gameServer.server.messages.BoatActionType;
+import seng302.gameServer.server.messages.BoatAction;
 import seng302.model.Player;
 import seng302.model.Yacht;
 
@@ -119,7 +119,7 @@ public class GameState implements Runnable {
         return yachts;
     }
 
-    public static void updateBoat(Integer sourceId, BoatActionType actionType) {
+    public static void updateBoat(Integer sourceId, BoatAction actionType) {
         Yacht playerYacht = yachts.get(sourceId);
 //        System.out.println("-----------------------");
         switch (actionType) {

src/main/java/seng302/gameServer/HeartbeatThread.java

@@ -42,7 +42,6 @@ public class HeartbeatThread extends Thread{
      */
     private void sendHeartbeatToAllPlayers(){
         Message heartbeat = new Heartbeat(seqNum);
-        System.out.println(GameState.getPlayers());
         for (Player player : GameState.getPlayers()){
             if (!player.getSocket().isConnected()) {
                 playerLostConnection(player);
@@ -54,7 +53,6 @@ public class HeartbeatThread extends Thread{
                 playerLostConnection(player);
             }
         }
-
         updateDelegate();
         seqNum++;
     }
@@ -71,7 +69,6 @@ public class HeartbeatThread extends Thread{
 
     public void run(){
         Timer t = new Timer();
-
         t.schedule(new TimerTask() {
             @Override
             public void run() {

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

@@ -2,17 +2,17 @@ package seng302.gameServer;
 
 import java.util.Arrays;
 import seng302.model.stream.packets.StreamPacket;
-import seng302.gameServer.server.messages.BoatActionType;
+import seng302.gameServer.server.messages.BoatAction;
 
 
 public class ServerPacketParser {
 
 
-    public static BoatActionType extractBoatAction(StreamPacket packet) {
+    public static BoatAction extractBoatAction(StreamPacket packet) {
         byte[] payload = packet.getPayload();
         int messageVersionNo = payload[0];
         long actionTypeValue = bytesToLong(Arrays.copyOfRange(payload, 0, 1));
-        return BoatActionType.getType((int) actionTypeValue);
+        return BoatAction.getType((int) actionTypeValue);
     }
 
     /**

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

@@ -25,7 +25,7 @@ import seng302.model.stream.packets.StreamPacket;
 import seng302.model.stream.xml.generator.Race;
 import seng302.model.stream.xml.generator.Regatta;
 import seng302.utilities.XMLGenerator;
-import seng302.gameServer.server.messages.BoatActionType;
+import seng302.gameServer.server.messages.BoatAction;
 import seng302.gameServer.server.messages.BoatLocationMessage;
 import seng302.gameServer.server.messages.BoatStatus;
 import seng302.gameServer.server.messages.BoatSubMessage;
@@ -168,7 +168,7 @@ public class ServerToClientThread implements Runnable, Observer {
                         //System.out.println("RECEIVED A PACKET");
                         switch (PacketType.assignPacketType(type, payload)) {
                             case BOAT_ACTION:
-                                BoatActionType actionType = ServerPacketParser
+                                BoatAction actionType = ServerPacketParser
                                     .extractBoatAction(
                                         new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.updateBoat(sourceId, actionType);

src/main/java/seng302/gameServer/server/messages/BoatAction.java

@@ -6,7 +6,7 @@ import java.util.Map;
 /**
  * Created by kre39 on 12/07/17.
  */
-public enum BoatActionType {
+public enum BoatAction {
 
     VMG(1),
     SAILS_IN(2),
@@ -17,19 +17,19 @@ public enum BoatActionType {
     MAINTAIN_HEADING(7);
 
     private final int type;
-    private static final Map<Integer, BoatActionType> intToTypeMap = new HashMap<>();
+    private static final Map<Integer, BoatAction> intToTypeMap = new HashMap<>();
 
     static {
-        for (BoatActionType type : BoatActionType.values()) {
+        for (BoatAction type : BoatAction.values()) {
             intToTypeMap.put(type.getValue(), type);
         }
     }
 
-    BoatActionType(int type){
+    BoatAction(int type){
         this.type = type;
     }
 
-    public static BoatActionType getType(int value) {
+    public static BoatAction getType(int value) {
         return intToTypeMap.get(value);
     }
 

src/main/java/seng302/gameServer/server/messages/BoatActionMessage.java

@@ -6,9 +6,9 @@ package seng302.gameServer.server.messages;
 public class BoatActionMessage extends Message{
     private final MessageType MESSAGE_TYPE = MessageType.BOAT_ACTION;
     private final int MESSAGE_SIZE = 1;
-    private BoatActionType actionType;
+    private BoatAction actionType;
 
-    public BoatActionMessage(BoatActionType actionType) {
+    public BoatActionMessage(BoatAction actionType) {
         this.actionType = actionType;
         setHeader(new Header(MessageType.BOAT_ACTION, 0, (short) 1)); // the second variable is the source id
         allocateBuffer();