Merge branch 'master' into new_issue#19

racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java

@@ -4,6 +4,7 @@ import mock.model.RaceLogic;
 import mock.model.ClientConnection;
 import mock.model.SourceIdAllocator;
 import mock.model.commandFactory.CompositeCommand;
+import network.AckSequencer;
 import network.Messages.Enums.XMLMessageType;
 import network.Messages.LatestMessages;
 import network.Messages.XMLMessage;
@@ -60,11 +61,6 @@ public class ConnectionAcceptor implements Runnable {
      */
     private SourceIdAllocator sourceIdAllocator;
 
-
-
-
-    //Acknowledgement number for packets
-    private int ackNumber = 0;
     //race xml sequence number
     private short raceXMLSequenceNumber;
     //boat xml sequence number
@@ -277,7 +273,7 @@ public class ConnectionAcceptor implements Runnable {
         //Create the message.
         XMLMessage message = new XMLMessage(
                 XMLMessage.currentVersionNumber,
-                getNextAckNumber(),
+                AckSequencer.getNextAckNum(),
                 System.currentTimeMillis(),
                 messageType,
                 sequenceNumber,
@@ -286,15 +282,4 @@ public class ConnectionAcceptor implements Runnable {
 
         return message;
     }
-
-    /**
-     * Increments the ackNumber value, and returns it.
-     * @return Incremented ackNumber.
-     */
-    private int getNextAckNumber(){
-        this.ackNumber++;
-
-        return this.ackNumber;
-    }
-
 }