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

Fixed issue where the new XML Decoder funtion was changed

Browse Source 
- Changed String XML Message to InputSource
#story[782]
This commit is contained in:
Fan-Wu Yang
2017-04-25 18:36:39 +12:00
parent 7b4a428574
commit be9f02997e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/Networking/BinaryMessageDecoder.java
+1 -2
View File
@@ -49,7 +49,6 @@ public class BinaryMessageDecoder {
//get crc //get crc
this.crc = Arrays.copyOfRange(this.fullMessage, this.fullMessage.length - 4, fullMessage.length); this.crc = Arrays.copyOfRange(this.fullMessage, this.fullMessage.length - 4, fullMessage.length);
System.out.println(ByteBuffer.wrap(this.crc).getInt());
CRC32 crc = new CRC32(); CRC32 crc = new CRC32();
@@ -95,7 +94,7 @@ public class BinaryMessageDecoder {
System.out.println("XML Message!"); System.out.println("XML Message!");
XMLMessageDecoder xmdecoder = new XMLMessageDecoder(this.message); XMLMessageDecoder xmdecoder = new XMLMessageDecoder(this.message);
xmdecoder.decode(); xmdecoder.decode();
data = new XMLMessage(xmdecoder.getAckNumber(), xmdecoder.getTimeStamp(), xmdecoder.getXmlMsgSubType(), xmdecoder.getSequenceNumber(), xmdecoder.getXmlMsgLength(), xmdecoder.getXmlMessage()); data = new XMLMessage(xmdecoder.getAckNumber(), xmdecoder.getTimeStamp(), xmdecoder.getXmlMsgSubType(), xmdecoder.getSequenceNumber(), xmdecoder.getXmlMsgLength(), xmdecoder.getXmlMessageInputSource());
break; break;
case RACESTARTSTATUS: case RACESTARTSTATUS:
System.out.println("Race Start Status Message"); System.out.println("Race Start Status Message");
src/main/java/seng302/Networking/Utils/XMLMessage.java
+4 -2
View File
@@ -1,5 +1,7 @@
package seng302.Networking.Utils; package seng302.Networking.Utils;
import org.xml.sax.InputSource;
/** /**
* Created by fwy13 on 25/04/17. * Created by fwy13 on 25/04/17.
*/ */
@@ -10,13 +12,13 @@ public class XMLMessage extends AC35Data{
private int xmlMsgSubType; private int xmlMsgSubType;
private int sequenceNumber; private int sequenceNumber;
private int xmlMsgLength; private int xmlMsgLength;
private String xmlMessage; private InputSource xmlMessage;
public static int XMLTypeRegatta = 5; public static int XMLTypeRegatta = 5;
public static int XMLTypeRace = 6; public static int XMLTypeRace = 6;
public static int XMLTypeBoat = 7; public static int XMLTypeBoat = 7;
public XMLMessage(int ackNumber, long timeStamp, int xmlMsgSubType, int sequenceNumber, int xmlMsgLength, String xmlMessage){ public XMLMessage(int ackNumber, long timeStamp, int xmlMsgSubType, int sequenceNumber, int xmlMsgLength, InputSource xmlMessage){
super(MessageType.XMLMESSAGE); super(MessageType.XMLMESSAGE);
this.ackNumber = ackNumber; this.ackNumber = ackNumber;
this.timeStamp = timeStamp; this.timeStamp = timeStamp;