small refactor of the VisualiserInput to better use the decoder
#story[782]
This commit is contained in:
@@ -12,4 +12,7 @@ public abstract class AC35Data {
|
|||||||
this.type = type;
|
this.type = type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MessageType getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,4 +28,7 @@ public class XMLMessage extends AC35Data{
|
|||||||
this.xmlMessage = xmlMessage;
|
this.xmlMessage = xmlMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public InputSource getXmlMessage() {
|
||||||
|
return xmlMessage;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,10 +55,13 @@ public class VisualiserInput
|
|||||||
|
|
||||||
//decode the binary message into readable date
|
//decode the binary message into readable date
|
||||||
BinaryMessageDecoder testDecoder = new BinaryMessageDecoder(binaryMessage);
|
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
|
//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) {
|
switch (mType) {
|
||||||
case HEARTBEAT:
|
case HEARTBEAT:
|
||||||
lastHeartbeatTime = System.currentTimeMillis();
|
lastHeartbeatTime = System.currentTimeMillis();
|
||||||
@@ -67,47 +70,45 @@ public class VisualiserInput
|
|||||||
System.out.println("HeartBeat Message! " + heartbeatSeqNum);
|
System.out.println("HeartBeat Message! " + heartbeatSeqNum);
|
||||||
break;
|
break;
|
||||||
case RACESTATUS:
|
case RACESTATUS:
|
||||||
// System.out.println("Race Status Message");
|
System.out.println("Race Status Message");
|
||||||
break;
|
break;
|
||||||
case DISPLAYTEXTMESSAGE:
|
case DISPLAYTEXTMESSAGE:
|
||||||
// System.out.println("Display Text Message");
|
System.out.println("Display Text Message");
|
||||||
//no decoder for this.
|
//no decoder for this.
|
||||||
break;
|
break;
|
||||||
case XMLMESSAGE:
|
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;
|
break;
|
||||||
case RACESTARTSTATUS:
|
case RACESTARTSTATUS:
|
||||||
// System.out.println("Race Start Status Message");
|
System.out.println("Race Start Status Message");
|
||||||
break;
|
break;
|
||||||
case YACHTEVENTCODE:
|
case YACHTEVENTCODE:
|
||||||
// System.out.println("Yacht Action Code!");
|
System.out.println("Yacht Action Code!");
|
||||||
//no decoder
|
//no decoder
|
||||||
break;
|
break;
|
||||||
case YACHTACTIONCODE:
|
case YACHTACTIONCODE:
|
||||||
// System.out.println("Yacht Action Code!");
|
System.out.println("Yacht Action Code!");
|
||||||
//no decoder
|
//no decoder
|
||||||
break;
|
break;
|
||||||
case CHATTERTEXT:
|
case CHATTERTEXT:
|
||||||
// System.out.println("Chatter Text Message!");
|
System.out.println("Chatter Text Message!");
|
||||||
//no decoder
|
//no decoder
|
||||||
break;
|
break;
|
||||||
case BOATLOCATION:
|
case BOATLOCATION:
|
||||||
// System.out.println("Boat Location Message!");
|
System.out.println("Boat Location Message!");
|
||||||
break;
|
break;
|
||||||
case MARKROUNDING:
|
case MARKROUNDING:
|
||||||
// System.out.println("Mark Rounding Message!");
|
System.out.println("Mark Rounding Message!");
|
||||||
break;
|
break;
|
||||||
case COURSEWIND:
|
case COURSEWIND:
|
||||||
// System.out.println("Course Wind Message!");
|
System.out.println("Course Wind Message!");
|
||||||
break;
|
break;
|
||||||
case AVGWIND:
|
case AVGWIND:
|
||||||
// System.out.println("Average Wind Message!");
|
System.out.println("Average Wind Message!");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// System.out.println("Broken Message!");
|
System.out.println("Broken Message!");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user