Merge branch 'networkingTest' into splitIntoTwoModules

network/src/main/java/seng302/Networking/Utils/AC35Data.java

@@ -12,4 +12,7 @@ public abstract class AC35Data {
         this.type = type;
     }
 
+    public MessageType getType() {
+        return type;
+    }
 }

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

@@ -101,10 +101,10 @@ public class ByteConverter {
         byte[] bites = new byte[maxSize];
         if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
             for (int i = 0; i < bytes.length; i++) {
-                bites[i] = bytes[i];
                 if (i > maxSize){//break if over hte limit
                     break;
                 }
+                bites[i] = bytes[i];
             }
             for (int i = bytes.length; i < maxSize; i++) {
                 bites[i] = 0b0;
@@ -114,10 +114,10 @@ public class ByteConverter {
                 bites[i] = 0b0;
             }
             for (int i = maxSize - bytes.length; i < maxSize; i++) {
-                bites[i] = bytes[i - maxSize + bytes.length];
                 if (i > maxSize){//break if over the limit
                     break;
                 }
+                bites[i] = bytes[i - maxSize + bytes.length];
             }
         }
         return bites;

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

@@ -28,4 +28,7 @@ public class XMLMessage extends AC35Data{
         this.xmlMessage = xmlMessage;
     }
 
+    public InputSource getXmlMessage() {
+        return xmlMessage;
+    }
 }

network/src/main/java/seng302/Networking/VisualiserInput.java

@@ -55,10 +55,13 @@ public class VisualiserInput
 
             //decode the binary message into readable date
             BinaryMessageDecoder testDecoder = new BinaryMessageDecoder(binaryMessage);
-            testDecoder.decode();
+            AC35Data data = testDecoder.decode();
+            if (data == null){
+                continue;
+            }
 
             //checks which message is being received and does what is needed for that message
-            MessageType mType = MessageType.valueOf((byte) testDecoder.getMessageType());
+            MessageType mType = data.getType();
             switch (mType) {
                 case HEARTBEAT:
                     lastHeartbeatTime = System.currentTimeMillis();
@@ -67,47 +70,45 @@ public class VisualiserInput
                     System.out.println("HeartBeat Message! " + heartbeatSeqNum);
                     break;
                 case RACESTATUS:
-//                    System.out.println("Race Status Message");
+                    System.out.println("Race Status Message");
                     break;
                 case DISPLAYTEXTMESSAGE:
-//                    System.out.println("Display Text Message");
+                    System.out.println("Display Text Message");
                     //no decoder for this.
                     break;
                 case XMLMESSAGE:
-//                    System.out.println("XML Message!");
+                    System.out.println("XML Message!");
-                    XMLMessageDecoder xmlMessageDecoder = new XMLMessageDecoder(testDecoder.getMessage());
+                    System.out.println(((XMLMessage)data).getXmlMessage());
-                    xmlMessageDecoder.decode();
-                    System.out.println(xmlMessageDecoder.getXmlMessageInputSource());
                     break;
                 case RACESTARTSTATUS:
-//                    System.out.println("Race Start Status Message");
+                    System.out.println("Race Start Status Message");
                     break;
                 case YACHTEVENTCODE:
-//                    System.out.println("Yacht Action Code!");
+                    System.out.println("Yacht Action Code!");
                     //no decoder
                     break;
                 case YACHTACTIONCODE:
-//                    System.out.println("Yacht Action Code!");
+                    System.out.println("Yacht Action Code!");
                     //no decoder
                     break;
                 case CHATTERTEXT:
-//                    System.out.println("Chatter Text Message!");
+                    System.out.println("Chatter Text Message!");
                     //no decoder
                     break;
                 case BOATLOCATION:
-//                    System.out.println("Boat Location Message!");
+                    System.out.println("Boat Location Message!");
                     break;
                 case MARKROUNDING:
-//                    System.out.println("Mark Rounding Message!");
+                    System.out.println("Mark Rounding Message!");
                     break;
                 case COURSEWIND:
-//                    System.out.println("Course Wind Message!");
+                    System.out.println("Course Wind Message!");
                     break;
                 case AVGWIND:
-//                    System.out.println("Average Wind Message!");
+                    System.out.println("Average Wind Message!");
                     break;
                 default:
-//                    System.out.println("Broken Message!");
+                    System.out.println("Broken Message!");
                     break;
             }