fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into new_issue#19

Browse Source 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
This commit is contained in:
David Wu
2017-08-17 17:00:39 +12:00
parent 598275591f 0490237c0c
commit 5234cdea66
48 changed files with 174 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/network/BinaryMessageDecoder.java
+3 -1
View File
@@ -6,12 +6,14 @@ import network.Exceptions.InvalidMessageTypeException;
import network.MessageDecoders.*;
import network.Messages.*;
import network.Messages.Enums.MessageType;
import static network.Utils.ByteConverter.*;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.zip.CRC32;
import static network.Utils.ByteConverter.bytesToInt;
import static network.Utils.ByteConverter.bytesToLong;
/**
* This class can be used to decode/convert a byte array into a messageBody object, descended from AC35Data.
*/
racevisionGame/src/main/java/network/BinaryMessageEncoder.java
+2 -2
View File
@@ -1,13 +1,13 @@
package network;
import network.Messages.Enums.MessageType;
import static network.Utils.ByteConverter.*;
import java.nio.ByteBuffer;
import java.util.zip.CRC32;
import static network.Utils.ByteConverter.*;
/**
* This class can be used to encode/convert a byte array message body, plus header data into a byte array containing the entire message, ready to send.
racevisionGame/src/main/java/network/MessageDecoders/RaceStatusDecoder.java
+1 -3
View File
@@ -14,9 +14,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static network.Utils.ByteConverter.bytesToInt;
import static network.Utils.ByteConverter.bytesToLong;
import static network.Utils.ByteConverter.bytesToShort;
import static network.Utils.ByteConverter.*;
/**
racevisionGame/src/main/java/network/MessageEncoders/RaceVisionByteEncoder.java
+3 -2
View File
@@ -7,13 +7,14 @@ import network.Exceptions.InvalidMessageTypeException;
import network.Messages.*;
import network.Messages.Enums.MessageType;
import static network.Utils.ByteConverter.*;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import static network.Utils.ByteConverter.intToBytes;
import static network.Utils.ByteConverter.longToBytes;
/**
racevisionGame/src/main/java/network/Messages/XMLMessage.java
-1
View File
@@ -4,7 +4,6 @@ package network.Messages;
import network.Messages.Enums.MessageType;
import network.Messages.Enums.XMLMessageType;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
/**