Added being able to decode everything into their respective classes

- Made classes for Heartbeat message, race status message, xml messag,e racestartstatus message, boat location message, mark rounding message, course wind message, average wind message.
- Made a statci calculation class for calculating bytes to int or long
- Message Decoder now kinda works!
#story[782]

src/main/java/seng302/Networking/BinaryMessageDecoder.java

@@ -1,6 +1,7 @@
 package seng302.Networking;
 
-import seng302.Networking.Utils.MessageType;
+import seng302.Networking.MessageDecoders.*;
+import seng302.Networking.Utils.*;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -28,7 +29,7 @@ public class BinaryMessageDecoder {
         this.fullMessage = fullMessage;
     }
 
-    public void decode() throws IndexOutOfBoundsException{
+    public AC35Data decode() throws IndexOutOfBoundsException{
         //get the header
         this.header = Arrays.copyOfRange(this.fullMessage, 0, 15);
 
@@ -41,13 +42,14 @@ public class BinaryMessageDecoder {
 
         if (15 > this.fullMessage.length - 4){
             //System.err.println("Message is too short.");
-            return;
+            return null;
         }
         //get message
         this.message = Arrays.copyOfRange(this.fullMessage, 15, this.fullMessage.length - 4);
 
         //get crc
         this.crc = Arrays.copyOfRange(this.fullMessage, this.fullMessage.length - 4, fullMessage.length);
+        System.out.println(ByteBuffer.wrap(this.crc).getInt());
 
 
         CRC32 crc = new CRC32();
@@ -59,62 +61,85 @@ public class BinaryMessageDecoder {
             System.err.println("message length in header does not equal the message length");
             System.err.println("message length in header: " + twoByteToInt(this.headerMessageLength));
             System.err.println("message length: " + this.message.length);
-            return;
+            return null;
         }else if(this.headerSync1 != 0x47){
             System.err.println("Sync byte 1 is wrong");
-            return;
+            return null;
         }else if(this.headerSync2 !=(byte) 0x83){
             System.err.println("Sync byte 2 is wrong");
-            return;
-        }/*else if(crc.getValue() != ByteBuffer.wrap(this.crc).getInt()){
+            return null;
+        }/*else if(crc.getValue() != 0){
             //todo check crc
-            System.err.println("CRC is not " + ByteBuffer.wrap(this.crc).getInt() + " and is instead:" + crc.getValue());
+            System.err.println("CRC is not 0 and is instead:" + crc.getValue());
             return;
         }*/
 
         MessageType mType = MessageType.valueOf(this.headerMessageType);
+        AC35Data data = null;
 
         switch(mType){
             case HEARTBEAT:
                 System.out.println("HeartBeat Message!");
+                data = new Heartbeat();
                 break;
-            case RACESTARTSTATUS:
+            case RACESTATUS:
                 System.out.println("Race Status Message");
+                RaceStatusDecoder rsdecoder = new RaceStatusDecoder(this.message);
+                data = new RaceStatus(rsdecoder.getTime(), rsdecoder.getRace(), rsdecoder.getRaceState(), rsdecoder.getStartTime(), rsdecoder.getRaceWindDir(), rsdecoder.getRaceWindSpeed(), rsdecoder.getRaceType(), rsdecoder.getBoats());
                 break;
             case DISPLAYTEXTMESSAGE:
                 System.out.println("Display Text Message");
+                //no decoder for this.
                 break;
             case XMLMESSAGE:
                 System.out.println("XML Message!");
+                XMLMessageDecoder xmdecoder = new XMLMessageDecoder(this.message);
+                xmdecoder.decode();
+                data = new XMLMessage(xmdecoder.getAckNumber(), xmdecoder.getTimeStamp(), xmdecoder.getXmlMsgSubType(), xmdecoder.getSequenceNumber(), xmdecoder.getXmlMsgLength(), xmdecoder.getXmlMessage());
                 break;
-            case RACESTATUS:
-                System.out.println("Race Start Status!");
+            case RACESTARTSTATUS:
+                System.out.println("Race Start Status Message");
+                RaceStartStatusDecoder rssDecoder = new RaceStartStatusDecoder(this.message);
+                data = new RaceStartStatus(rssDecoder.getTime(), rssDecoder.getAck(), rssDecoder.getStartTime(), rssDecoder.getRaceID(), rssDecoder. getNotification());
                 break;
             case YACHTEVENTCODE:
                 System.out.println("Yacht Action Code!");
+                //no decoder
+                break;
+            case YACHTACTIONCODE:
+                System.out.println("Yacht Action Code!");
+                //no decoder
                 break;
             case CHATTERTEXT:
                 System.out.println("Chatter Text Message!");
+                //no decoder
                 break;
             case BOATLOCATION:
                 System.out.println("Boat Location Message!");
+                BoatLocationDecoder blDecoder = new BoatLocationDecoder(this.message);
+                data = blDecoder.getMessage();
                 break;
             case MARKROUNDING:
                 System.out.println("Mark Rounding Message!");
+                MarkRoundingDecoder mrDecoder = new MarkRoundingDecoder(this.message);
+                data = mrDecoder.getMarkRounding();
                 break;
             case COURSEWIND:
                 System.out.println("Couse Wind Message!");
+                CourseWindDecoder cwDecoder = new CourseWindDecoder(this.message);
+                data =new CourseWinds(cwDecoder.getMessageVersionNumber(), cwDecoder.getByteWindID(), cwDecoder.getLoopMessages());
                 break;
             case AVGWIND:
                 System.out.println("Average Wind Message!");
+                AverageWindDecoder awDecoder = new AverageWindDecoder(this.message);
+                data = awDecoder.getAverageWind();
                 break;
             default:
                 System.out.println("Broken Message!");
                 break;
-
-
         }
 
+        return data;
     }
 
 

src/main/java/seng302/Networking/MessageDecoders/AverageWindDecoder.java

@@ -1,5 +1,8 @@
 package seng302.Networking.MessageDecoders;
 
+import seng302.Networking.Utils.AverageWind;
+import seng302.Networking.Utils.ByteConverter;
+
 import java.util.Arrays;
 
 /**
@@ -17,6 +20,8 @@ public class AverageWindDecoder {
     byte[] bytePeriod4;
     byte[] byteSpeed4;
 
+    AverageWind averageWind;
+
     public AverageWindDecoder(byte[] encodedAverageWind) {
         messageVersionNumber = encodedAverageWind[0];
         byteTime = Arrays.copyOfRange(encodedAverageWind, 1, 7);
@@ -28,5 +33,23 @@ public class AverageWindDecoder {
         byteSpeed3 = Arrays.copyOfRange(encodedAverageWind, 17, 19);
         bytePeriod4 = Arrays.copyOfRange(encodedAverageWind, 19, 21);
         byteSpeed4 = Arrays.copyOfRange(encodedAverageWind, 21, 23);
+
+        int msgNum = ByteConverter.bytesToInt(messageVersionNumber);
+        long lngTime = ByteConverter.bytesToLong(byteTime);
+        int intRawPeriod = ByteConverter.bytesToInt(byteRawPeriod);
+        int intRawSpeed = ByteConverter.bytesToInt(byteRawSpeed);
+        int intPeriod2 = ByteConverter.bytesToInt(bytePeriod2);
+        int intSpeed2 = ByteConverter.bytesToInt(byteSpeed2);
+        int intPeriod3 = ByteConverter.bytesToInt(bytePeriod3);
+        int intSpeed3 = ByteConverter.bytesToInt(byteSpeed3);
+        int intPeriod4 = ByteConverter.bytesToInt(bytePeriod4);
+        int intSpeed4 = ByteConverter.bytesToInt(byteSpeed4);
+
+        this.averageWind = new AverageWind(msgNum, lngTime, intRawPeriod, intRawSpeed, intPeriod2, intSpeed2, intPeriod3, intSpeed3, intPeriod4, intSpeed4);
+
+    }
+
+    public AverageWind getAverageWind() {
+        return averageWind;
     }
 }

src/main/java/seng302/Networking/MessageDecoders/CourseWindDecoder.java

@@ -83,4 +83,12 @@ public class CourseWindDecoder {
     public ArrayList<CourseWind> getLoopMessages() {
         return loopMessages;
     }
+
+    public byte getMessageVersionNumber() {
+        return messageVersionNumber;
+    }
+
+    public byte getByteWindID() {
+        return byteWindID;
+    }
 }

src/main/java/seng302/Networking/MessageDecoders/MarkRoundingDecoder.java

@@ -1,5 +1,8 @@
 package seng302.Networking.MessageDecoders;
 
+import seng302.Networking.Utils.ByteConverter;
+import seng302.Networking.Utils.MarkRounding;
+
 import java.util.Arrays;
 
 /**
@@ -16,15 +19,33 @@ public class MarkRoundingDecoder {
     byte byteMarkType;
     byte byteMarkID;
 
+    MarkRounding markRounding;
+
     public MarkRoundingDecoder(byte[] encodedMarkRounding) {
         messageVersionNumber = encodedMarkRounding[0];
         byteTime = Arrays.copyOfRange(encodedMarkRounding, 1, 7);
         byteAck = Arrays.copyOfRange(encodedMarkRounding, 7, 9);
         byteRaceID = Arrays.copyOfRange(encodedMarkRounding, 9, 13);
-        byteSourceID = Arrays.copyOfRange(encodedMarkRounding, 13, 18);
-        byteBoatStatus = encodedMarkRounding[18];
-        byteRoundingSide = encodedMarkRounding[19];
-        byteMarkType = encodedMarkRounding[20];
-        byteMarkID = encodedMarkRounding[21];
+        byteSourceID = Arrays.copyOfRange(encodedMarkRounding, 13, 17);
+        byteBoatStatus = encodedMarkRounding[17];
+        byteRoundingSide = encodedMarkRounding[18];
+        byteMarkType = encodedMarkRounding[19];
+        byteMarkID = encodedMarkRounding[20];
+
+        int intMsgVer = ByteConverter.bytesToInt(messageVersionNumber);
+        long lngTime = ByteConverter.bytesToLong(byteTime);
+        int intAck = ByteConverter.bytesToInt(byteAck);
+        int intRaceID = ByteConverter.bytesToInt(byteRaceID);
+        int intSourceID = ByteConverter.bytesToInt(byteSourceID);
+        int intBoatState = ByteConverter.bytesToInt(byteBoatStatus);
+        int intRoundingSide = ByteConverter.bytesToInt(byteRoundingSide);
+        int intMarkType = ByteConverter.bytesToInt(byteMarkType);
+        int intMarkID = ByteConverter.bytesToInt(byteMarkID);
+
+        markRounding = new MarkRounding(intMsgVer, lngTime, intAck, intRaceID, intSourceID, intBoatState, intRoundingSide, intMarkType, intMarkID);
+    }
+
+    public MarkRounding getMarkRounding() {
+        return markRounding;
     }
 }

src/main/java/seng302/Networking/MessageEncoders/RaceVisionByteEncoder.java

@@ -165,7 +165,7 @@ public class RaceVisionByteEncoder {
         byte[] time = convert(boatLocationMessage.getTime(), 6);
         byte[] sourceID = convert(boatLocationMessage.getSourceID(), 4);
         byte[] seqNum = convert(boatLocationMessage.getSequenceNumber(), 4);
-        byte deviceType = boatLocationMessage.getDeviceType();
+        byte[] deviceType = convert(boatLocationMessage.getDeviceType(), 1);
         byte[] latitude = convert(boatLocationMessage.getLatitude(), 4);
         byte[] longitude = convert(boatLocationMessage.getLongitude(), 4);
         byte[] altitude = convert(boatLocationMessage.getAltitude(), 4);

src/main/java/seng302/Networking/Utils/AverageWind.java

@@ -0,0 +1,33 @@
+package seng302.Networking.Utils;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class AverageWind extends AC35Data{
+
+    private int msgNum;
+    private long lngTime;
+    private int rawPeriod;
+    private int rawSpeed;
+    private int period2;
+    private int speed2;
+    private int period3;
+    private int speed3;
+    private int period4;
+    private int speed4;
+
+    public AverageWind(int msgNum, long lngTime, int rawPeriod, int rawSpeed, int period2, int speed2, int period3, int speed3, int period4, int speed4){
+        super(MessageType.AVGWIND);
+        this.msgNum = msgNum;
+        this.lngTime = lngTime;
+        this.rawPeriod = rawPeriod;
+        this.rawSpeed = rawSpeed;
+        this.period2 = period2;
+        this.speed2 = speed2;
+        this.period3 = period3;
+        this.speed3 = speed3;
+        this.period4 = period4;
+        this.speed4 = speed4;
+    }
+
+}

src/main/java/seng302/Networking/Utils/BoatLocationMessage.java

@@ -10,7 +10,7 @@ package seng302.Networking.Utils;
 public class BoatLocationMessage extends AC35Data
 {
     ///Version number of the message - is always 1.
-    private byte messageVersionNumber = 1;
+    private int messageVersionNumber = 1;
 
     ///Time of the event - milliseconds since jan 1 1970. Proper type is 6 byte int.
     private long time;
@@ -22,7 +22,7 @@ public class BoatLocationMessage extends AC35Data
     private int sequenceNumber;
 
     ///Device type of the message (physical source of the message).
-    private byte deviceType;
+    private int deviceType;
 
     ///Latitude of the boat.
     private int latitude;
@@ -37,10 +37,10 @@ public class BoatLocationMessage extends AC35Data
     private int heading;
 
     ///Pitch of the boat.
-    private short pitch;
+    private int pitch;
 
     ///Roll of the boat.
-    private short roll;
+    private int roll;
 
     ///Speed of the boat. Proper type is unsigned 2 byte int. millimeters per second.
     private int boatSpeed;
@@ -55,15 +55,15 @@ public class BoatLocationMessage extends AC35Data
     private int apparentWindSpeed;
 
     ///Apparent wind angle at time of the event. Wind over starboard = positive.
-    private short apparentWindAngle;
+    private int apparentWindAngle;
 
     ///True wind speed. Proper type is unsigned 2 byte int. millimeters per second.
     private int trueWindSpeed;
 
-    private short trueWindDirection;
+    private int trueWindDirection;
 
     ///True wind angle. Clockwise compass direction, 0 = north.
-    private short trueWindAngle;
+    private int trueWindAngle;
 
     ///Current drift. Proper type is unsigned 2 byte int. millimeters per second.
     private int currentDrift;
@@ -72,7 +72,7 @@ public class BoatLocationMessage extends AC35Data
     private int currentSet;
 
     ///Rudder angle. Positive is rudder set to turn yacht to port.
-    private short rudderAngle;
+    private int rudderAngle;
 
 
     /**
@@ -108,7 +108,7 @@ public class BoatLocationMessage extends AC35Data
      * @param currentSet
      * @param rudderAngle
      */
-    public BoatLocationMessage(byte messageVersionNumber, long time, int sourceID, int sequenceNumber, byte deviceType, int latitude, int longitude, int altitude, int heading, short pitch, short roll, int boatSpeed, int boatCOG, int boatSOG, int apparentWindSpeed, short apparentWindAngle, int trueWindSpeed, short trueWindDirection, short trueWindAngle, int currentDrift, int currentSet, short rudderAngle)
+    public BoatLocationMessage(int messageVersionNumber, long time, int sourceID, int sequenceNumber, int deviceType, int latitude, int longitude, int altitude, int heading, int pitch, int roll, int boatSpeed, int boatCOG, int boatSOG, int apparentWindSpeed, int apparentWindAngle, int trueWindSpeed, int trueWindDirection, int trueWindAngle, int currentDrift, int currentSet, int rudderAngle)
     {
         super(MessageType.BOATLOCATION);
         this.messageVersionNumber = messageVersionNumber;
@@ -139,12 +139,12 @@ public class BoatLocationMessage extends AC35Data
     //Getters and setters for message properties.
 
     
-    public byte getMessageVersionNumber()
+    public int getMessageVersionNumber()
     {
         return messageVersionNumber;
     }
 
-    public void setMessageVersionNumber(byte messageVersionNumber)
+    public void setMessageVersionNumber(int messageVersionNumber)
     {
         this.messageVersionNumber = messageVersionNumber;
     }
@@ -179,12 +179,12 @@ public class BoatLocationMessage extends AC35Data
         this.sequenceNumber = sequenceNumber;
     }
 
-    public byte getDeviceType()
+    public int getDeviceType()
     {
         return deviceType;
     }
 
-    public void setDeviceType(byte deviceType)
+    public void setDeviceType(int deviceType)
     {
         this.deviceType = deviceType;
     }
@@ -229,22 +229,22 @@ public class BoatLocationMessage extends AC35Data
         this.heading = heading;
     }
 
-    public short getPitch()
+    public int getPitch()
     {
         return pitch;
     }
 
-    public void setPitch(short pitch)
+    public void setPitch(int pitch)
     {
         this.pitch = pitch;
     }
 
-    public short getRoll()
+    public int getRoll()
     {
         return roll;
     }
 
-    public void setRoll(short roll)
+    public void setRoll(int roll)
     {
         this.roll = roll;
     }
@@ -289,12 +289,12 @@ public class BoatLocationMessage extends AC35Data
         this.apparentWindSpeed = apparentWindSpeed;
     }
 
-    public short getApparentWindAngle()
+    public int getApparentWindAngle()
     {
         return apparentWindAngle;
     }
 
-    public void setApparentWindAngle(short apparentWindAngle)
+    public void setApparentWindAngle(int apparentWindAngle)
     {
         this.apparentWindAngle = apparentWindAngle;
     }
@@ -309,20 +309,20 @@ public class BoatLocationMessage extends AC35Data
         this.trueWindSpeed = trueWindSpeed;
     }
 
-    public short getTrueWindDirection() {
+    public int getTrueWindDirection() {
         return trueWindDirection;
     }
 
-    public void setTrueWindDirection(short trueWindDirection) {
+    public void setTrueWindDirection(int trueWindDirection) {
         this.trueWindDirection = trueWindDirection;
     }
 
-    public short getTrueWindAngle()
+    public int getTrueWindAngle()
     {
         return trueWindAngle;
     }
 
-    public void setTrueWindAngle(short trueWindAngle)
+    public void setTrueWindAngle(int trueWindAngle)
     {
         this.trueWindAngle = trueWindAngle;
     }
@@ -347,12 +347,12 @@ public class BoatLocationMessage extends AC35Data
         this.currentSet = currentSet;
     }
 
-    public short getRudderAngle()
+    public int getRudderAngle()
     {
         return rudderAngle;
     }
 
-    public void setRudderAngle(short rudderAngle)
+    public void setRudderAngle(int rudderAngle)
     {
         this.rudderAngle = rudderAngle;
     }

src/main/java/seng302/Networking/Utils/ByteConverter.java

@@ -0,0 +1,92 @@
+package seng302.Networking.Utils;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class ByteConverter {
+
+    //default for AC35 is Little Endian therefore all overloads will be done with Little_Endian unless told else wise
+
+    public static int bytesToInt(byte bite){
+        byte[] bytes = {bite};
+        return bytesToInt(bytes, ByteOrder.LITTLE_ENDIAN);
+    }
+
+    public static int bytesToInt(byte bite, ByteOrder byteOrder){
+        byte[] bytes = {bite};
+        return bytesToInt(bytes, byteOrder);
+    }
+
+    public static int bytesToInt(byte[] bytes){
+        return bytesToInt(bytes, ByteOrder.LITTLE_ENDIAN);
+    }
+
+    public static int bytesToInt(byte[] bytes, ByteOrder byteOrder){
+        byte[] bites = new byte[4];
+        if (byteOrder == ByteOrder.LITTLE_ENDIAN){
+            for (int i = 0; i < bytes.length; i++){
+               bites[i] = bytes[i];
+               if (i > 4){//break if over the limit
+                   break;
+               }
+            }
+            for (int i = bytes.length; i < 4; i++){
+                bites[i] = 0b0;
+            }
+        }else{//if big endian
+            for (int i = 0; i <  4 - bytes.length; i++) {
+                bites[i] = 0b0;
+            }
+            for (int i = 4 - bytes.length; i < 4; i++) {
+                bites[i] = bytes[i];
+                if (i > 4){//break if over the limit
+                    break;
+                }
+            }
+        }
+        return ByteBuffer.wrap(bites).order(byteOrder).getInt();
+    }
+
+    public static long bytesToLong(byte bite){
+        byte[] bytes = {bite};
+        return bytesToLong(bytes, ByteOrder.LITTLE_ENDIAN);
+    }
+
+    public static long bytesToLong(byte bite, ByteOrder byteOrder){
+        byte[] bytes = {bite};
+        return bytesToLong(bytes, byteOrder);
+    }
+
+    public static long bytesToLong(byte[] bytes){
+        return bytesToLong(bytes, ByteOrder.LITTLE_ENDIAN);
+    }
+
+    public static long bytesToLong(byte[] bytes, ByteOrder byteOrder){
+        byte[] bites = new byte[8];
+        if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
+            for (int i = 0; i < bytes.length; i++) {
+                bites[i] = bytes[i];
+                if (i > 8){//break if over hte limit
+                    break;
+                }
+            }
+            for (int i = bytes.length; i < 8; i++) {
+                bites[i] = 0b0;
+            }
+        }else{//if big endian
+            for (int i = 0; i <  8 - bytes.length; i++) {
+                bites[i] = 0b0;
+            }
+            for (int i = 8 - bytes.length; i < 8; i++) {
+                bites[i] = bytes[i];
+                if (i > 8){//break if over the limit
+                    break;
+                }
+            }
+        }
+        return ByteBuffer.wrap(bites).order(byteOrder).getInt();
+    }
+}

src/main/java/seng302/Networking/Utils/CourseWinds.java

@@ -0,0 +1,21 @@
+package seng302.Networking.Utils;
+
+import java.util.ArrayList;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class CourseWinds extends AC35Data{
+
+    private int msgVerNum;
+    private int selectedWindID;
+    private ArrayList<CourseWind> courseWinds;
+
+    public CourseWinds(int msgVerNum, int selectedWindID, ArrayList<CourseWind> courseWinds){
+        super(MessageType.COURSEWIND);
+        this.msgVerNum = msgVerNum;
+        this.selectedWindID = selectedWindID;
+        this.courseWinds = courseWinds;
+    }
+
+}

src/main/java/seng302/Networking/Utils/Heartbeat.java

@@ -0,0 +1,12 @@
+package seng302.Networking.Utils;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class Heartbeat extends AC35Data{
+
+    public Heartbeat(){
+        super(MessageType.HEARTBEAT);
+    }
+
+}

src/main/java/seng302/Networking/Utils/MarkRounding.java

@@ -0,0 +1,52 @@
+package seng302.Networking.Utils;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class MarkRounding extends AC35Data{
+
+    private int msgVerNum;
+    private long time;
+    private int ackNum;
+    private int raceID;
+    private int sourceID;
+    private int boatStatus;
+    private int roundingSide;
+    private int markType;
+    private int markID;
+
+    public static int BoatStatusUnknown = 0;
+    public static int BoatStatusRacing = 1;
+    public static int BoatStatusDSQ = 2;
+    public static int BoatStatusWithdrawn = 3;
+
+    public static int RoundingSideUnknown = 0;
+    public static int RoundingSidePort = 1;
+    public static int RoundingSideStarboard = 2;
+
+    public static int MarkTypeUnknown = 0;
+    public static int MarkTypeRoundingMark = 1;
+    public static int MarkTypeGate = 2;
+
+    public static int MarkIDEntryLimitLine = 100;
+    public static int MarkIDEntryLine = 101;
+    public static int MarkIDRaceStartStartline = 102;
+    public static int MarkIDRaceFinishline = 103;
+    public static int MarkIDSpeedTestStart = 104;
+    public static int MarkIDSpeedTestFinish = 105;
+    public static int MarkIDClearStart = 106;
+
+    public MarkRounding(int msgVerNum, long time, int ackNum, int raceID, int sourceID, int boatStatus, int roundingSide, int markType, int markID){
+        super(MessageType.MARKROUNDING);
+        this.msgVerNum = msgVerNum;
+        this.time = time;
+        this.ackNum = ackNum;
+        this.raceID = raceID;
+        this.sourceID = sourceID;
+        this.boatStatus = boatStatus;
+        this.roundingSide = roundingSide;
+        this.markType = markType;
+        this.markID = markID;
+    }
+
+}

src/main/java/seng302/Networking/Utils/RaceStartStatus.java

@@ -0,0 +1,24 @@
+package seng302.Networking.Utils;
+
+import java.util.ArrayList;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class RaceStartStatus extends AC35Data{
+    private long timestamp;
+    private int ackNum;
+    private long raceStartTime;
+    private int raceID;
+    private int notificationType;
+
+    public RaceStartStatus(long timestamp, int ackNum, long raceStartTime, int raceID, int notificationType){
+        super(MessageType.RACESTARTSTATUS);
+        this.timestamp = timestamp;
+        this.ackNum = ackNum;
+        this.raceStartTime = raceStartTime;
+        this.raceID = raceID;
+        this.notificationType = notificationType;
+    }
+
+}

src/main/java/seng302/Networking/Utils/RaceStatus.java

@@ -0,0 +1,30 @@
+package seng302.Networking.Utils;
+
+import java.util.ArrayList;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class RaceStatus  extends AC35Data{
+    long currentTime;
+    int raceID;
+    int raceStatus;
+    long expectedStartTime;
+    int windDirection;
+    int windSpeed;
+    int raceType;
+    ArrayList<BoatStatus> boatStatuses;
+
+    public RaceStatus(long currentTime, int raceID, int raceStatus, long expectedStartTime, int windDirection, int windSpeed, int raceType, ArrayList<BoatStatus> boatStatuses){
+        super(MessageType.RACESTATUS);
+        this.currentTime = currentTime;
+        this.raceID = raceID;
+        this.raceStatus = raceStatus;
+        this.expectedStartTime = expectedStartTime;
+        this.windDirection = windDirection;
+        this.windSpeed = windSpeed;
+        this.raceType = raceType;
+        this.boatStatuses = boatStatuses;//note this is a copy so any alterations to the parent will affect this.
+    }
+
+}

src/main/java/seng302/Networking/Utils/XMLMessage.java

@@ -0,0 +1,29 @@
+package seng302.Networking.Utils;
+
+/**
+ * Created by fwy13 on 25/04/17.
+ */
+public class XMLMessage extends AC35Data{
+
+    private int ackNumber;
+    private long timeStamp;
+    private int xmlMsgSubType;
+    private int sequenceNumber;
+    private int xmlMsgLength;
+    private String xmlMessage;
+
+    public static int XMLTypeRegatta = 5;
+    public static int XMLTypeRace = 6;
+    public static int XMLTypeBoat = 7;
+
+    public XMLMessage(int ackNumber, long timeStamp, int xmlMsgSubType, int sequenceNumber, int xmlMsgLength, String xmlMessage){
+        super(MessageType.XMLMESSAGE);
+        this.ackNumber = ackNumber;
+        this.timeStamp = timeStamp;
+        this.xmlMsgSubType = xmlMsgSubType;
+        this.sequenceNumber = sequenceNumber;
+        this.xmlMsgLength = xmlMsgLength;
+        this.xmlMessage = xmlMessage;
+    }
+
+}

src/test/java/seng302/Networking/MessageDecoders/BoatLocationDecoderTest.java

@@ -13,11 +13,11 @@ public class BoatLocationDecoderTest {
     @Test
     public void getByteArrayTest(){
         long time = System.currentTimeMillis();
-        BoatLocationMessage testMessage = new BoatLocationMessage((byte)1, time, (byte)2,
-                3, (byte) 1, 180, -180, 4, (short)5,
-                (short)6, (short)7, 8, 9, 10, 11,
-                (short) 12, 13,(short) 14 ,(short) 15,
-                16, 17, (short) 18);
+        BoatLocationMessage testMessage = new BoatLocationMessage(1, time, 2,
+                3,  1, 180, -180, 4, 5,
+                6, 7, 8, 9, 10, 11,
+                12, 13, 14 , 15,
+                16, 17,  18);
         RaceVisionByteEncoder raceVisionByteEncoder = new RaceVisionByteEncoder();
         byte [] testEncodedMessage = raceVisionByteEncoder.boatLocation(testMessage);