From be9f02997e480456ec0240e45b23adf32781a0c7 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Tue, 25 Apr 2017 18:36:39 +1200 Subject: [PATCH] Fixed issue where the new XML Decoder funtion was changed - Changed String XML Message to InputSource #story[782] --- src/main/java/seng302/Networking/BinaryMessageDecoder.java | 3 +-- src/main/java/seng302/Networking/Utils/XMLMessage.java | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/seng302/Networking/BinaryMessageDecoder.java b/src/main/java/seng302/Networking/BinaryMessageDecoder.java index e4aa8e99..4832fcd5 100644 --- a/src/main/java/seng302/Networking/BinaryMessageDecoder.java +++ b/src/main/java/seng302/Networking/BinaryMessageDecoder.java @@ -49,7 +49,6 @@ public class BinaryMessageDecoder { //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(); @@ -95,7 +94,7 @@ public class BinaryMessageDecoder { 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()); + data = new XMLMessage(xmdecoder.getAckNumber(), xmdecoder.getTimeStamp(), xmdecoder.getXmlMsgSubType(), xmdecoder.getSequenceNumber(), xmdecoder.getXmlMsgLength(), xmdecoder.getXmlMessageInputSource()); break; case RACESTARTSTATUS: System.out.println("Race Start Status Message"); diff --git a/src/main/java/seng302/Networking/Utils/XMLMessage.java b/src/main/java/seng302/Networking/Utils/XMLMessage.java index 282b090a..733123e3 100644 --- a/src/main/java/seng302/Networking/Utils/XMLMessage.java +++ b/src/main/java/seng302/Networking/Utils/XMLMessage.java @@ -1,5 +1,7 @@ package seng302.Networking.Utils; +import org.xml.sax.InputSource; + /** * Created by fwy13 on 25/04/17. */ @@ -10,13 +12,13 @@ public class XMLMessage extends AC35Data{ private int xmlMsgSubType; private int sequenceNumber; private int xmlMsgLength; - private String xmlMessage; + private InputSource 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){ + public XMLMessage(int ackNumber, long timeStamp, int xmlMsgSubType, int sequenceNumber, int xmlMsgLength, InputSource xmlMessage){ super(MessageType.XMLMESSAGE); this.ackNumber = ackNumber; this.timeStamp = timeStamp;