From 63514cfafbee35873d1236988aa9e68b6f79ce8e Mon Sep 17 00:00:00 2001 From: Peter Galloway Date: Sun, 14 May 2017 20:20:14 +1200 Subject: [PATCH] deleted duplicated packet type class #story[923] --- .../seng302/models/parsers/PacketType.java | 53 ------------------- .../seng302/models/parsers/StreamPacket.java | 2 + .../models/parsers/packets/PacketType.java | 2 - 3 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/seng302/models/parsers/PacketType.java diff --git a/src/main/java/seng302/models/parsers/PacketType.java b/src/main/java/seng302/models/parsers/PacketType.java deleted file mode 100644 index 66b86207..00000000 --- a/src/main/java/seng302/models/parsers/PacketType.java +++ /dev/null @@ -1,53 +0,0 @@ -package seng302.models.parsers; - -/** - * Created by Kusal on 4/24/2017. - */ -public enum PacketType { - HEARTBEAT, - RACE_STATUS, - DISPLAY_TEXT_MESSAGE, - XML_MESSAGE, - RACE_START_STATUS, - YACHT_EVENT_CODE, - YACHT_ACTION_CODE, - CHATTER_TEXT, - BOAT_LOCATION, - MARK_ROUNDING, - COURSE_WIND, - AVG_WIND, - OTHER; - - static PacketType assignPacketType(int packetType){ - switch(packetType){ - case 1: - return HEARTBEAT; - case 12: - return RACE_STATUS; - case 20: - return DISPLAY_TEXT_MESSAGE; - case 26: - return XML_MESSAGE; - case 27: - return RACE_START_STATUS; - case 29: - return YACHT_EVENT_CODE; - case 31: - return YACHT_ACTION_CODE; - case 36: - return CHATTER_TEXT; - case 37: - return BOAT_LOCATION; - case 38: - return MARK_ROUNDING; - case 44: - return COURSE_WIND; - case 47: - return AVG_WIND; - default: - } - return OTHER; - } - - -} diff --git a/src/main/java/seng302/models/parsers/StreamPacket.java b/src/main/java/seng302/models/parsers/StreamPacket.java index 5c2c0706..f4ba3b81 100644 --- a/src/main/java/seng302/models/parsers/StreamPacket.java +++ b/src/main/java/seng302/models/parsers/StreamPacket.java @@ -1,5 +1,7 @@ package seng302.models.parsers; +import seng302.models.parsers.packets.PacketType; + /** * Created by kre39 on 23/04/17. */ diff --git a/src/main/java/seng302/models/parsers/packets/PacketType.java b/src/main/java/seng302/models/parsers/packets/PacketType.java index f522dec9..4367ca90 100644 --- a/src/main/java/seng302/models/parsers/packets/PacketType.java +++ b/src/main/java/seng302/models/parsers/packets/PacketType.java @@ -48,6 +48,4 @@ public enum PacketType { } return OTHER; } - - }