From 00c1a89f58c7494a21e9b440f872c2789889e84c Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Tue, 25 Apr 2017 15:39:28 +1200 Subject: [PATCH] Fixed error in the switch (missing breaks) #story[820] --- .../seng302/models/parsers/StreamPacket.java | 10 +++++----- .../seng302/models/parsers/StreamParser.java | 20 +++++++++++++++---- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/seng302/models/parsers/StreamPacket.java b/src/main/java/seng302/models/parsers/StreamPacket.java index fa79763d..35bd526f 100644 --- a/src/main/java/seng302/models/parsers/StreamPacket.java +++ b/src/main/java/seng302/models/parsers/StreamPacket.java @@ -12,7 +12,7 @@ public class StreamPacket { private long timeStamp; private byte[] payload; - public StreamPacket(int type, long messageLength, long timeStamp, byte[] payload) { + StreamPacket(int type, long messageLength, long timeStamp, byte[] payload) { this.type = PacketType.assignPacketType(type); this.messageLength = messageLength; this.timeStamp = timeStamp; @@ -20,11 +20,11 @@ public class StreamPacket { // System.out.println("type = " + type); if (this.type == PacketType.OTHER){ System.out.println("type = " + type); -// StreamParser.extractBoatLocation(payload); + StreamParser.parsePacket(this); } } - public PacketType getType() { + PacketType getType() { return type; } @@ -32,11 +32,11 @@ public class StreamPacket { return messageLength; } - public byte[] getPayload() { + byte[] getPayload() { return payload; } - public long getTimeStamp() { + long getTimeStamp() { return timeStamp; } } diff --git a/src/main/java/seng302/models/parsers/StreamParser.java b/src/main/java/seng302/models/parsers/StreamParser.java index d29d49c8..4fb6d4e3 100644 --- a/src/main/java/seng302/models/parsers/StreamParser.java +++ b/src/main/java/seng302/models/parsers/StreamParser.java @@ -19,39 +19,51 @@ import java.util.Map; */ public class StreamParser { - static void parseLine(StreamPacket packet) { + static void parsePacket(StreamPacket packet) { switch (packet.getType()){ case HEARTBEAT: extractHeartBeat(packet); + break; case RACE_STATUS: extractRaceStatus(packet); + break; case DISPLAY_TEXT_MESSAGE: extractDisplayMessage(packet); + break; case XML_MESSAGE: extractXmlMessage(packet); + break; case RACE_START_STATUS: extractRaceStartStatus(packet); + break; case YACHT_EVENT_CODE: extractYachtEventCode(packet); + break; case YACHT_ACTION_CODE: extractYachtActionCode(packet); + break; case CHATTER_TEXT: extractChatterText(packet); + break; case BOAT_LOCATION: extractBoatLocation(packet); + break; case MARK_ROUNDING: extractMarkRounding(packet); + break; case COURSE_WIND: extractCourseWind(packet); + break; case AVG_WIND: extractAvgWind(packet); + break; + default: + System.out.println(packet.getType().toString()); } - - } private static void extractHeartBeat(StreamPacket packet){ - + System.out.println(bytesToLong(packet.getPayload())); } private static void extractRaceStatus(StreamPacket packet){