diff --git a/ChatApp/src/client/ClientConnexion.java b/ChatApp/src/client/ClientConnexion.java index 0c30ed6..e2995ef 100644 --- a/ChatApp/src/client/ClientConnexion.java +++ b/ChatApp/src/client/ClientConnexion.java @@ -3,7 +3,6 @@ package client; import java.io.IOException; import java.net.DatagramSocket; import java.net.InetSocketAddress; -import java.time.Instant; import network.PacketHandler; import network.SocketReader; diff --git a/ChatApp/src/network/protocol/Packets.java b/ChatApp/src/network/protocol/Packets.java deleted file mode 100644 index 8a1effb..0000000 --- a/ChatApp/src/network/protocol/Packets.java +++ /dev/null @@ -1,15 +0,0 @@ -package network.protocol; - -public enum Packets { - - ChatMessage, - CreateRoom, - JoinRoom, - LeaveRoom, - Login, - RequestRoom, - Response, - RoomList, - SendChatMessage, - -} \ No newline at end of file diff --git a/ChatApp/src/network/protocol/packets/ChatMessagePacket.java b/ChatApp/src/network/protocol/packets/ChatMessagePacket.java index ee79aeb..aa7978c 100644 --- a/ChatApp/src/network/protocol/packets/ChatMessagePacket.java +++ b/ChatApp/src/network/protocol/packets/ChatMessagePacket.java @@ -4,12 +4,9 @@ import java.time.Instant; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class ChatMessagePacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - private final Instant time; private final String chatter; private final String content; diff --git a/ChatApp/src/network/protocol/packets/CreateRoomPacket.java b/ChatApp/src/network/protocol/packets/CreateRoomPacket.java index 046a7b5..894631c 100644 --- a/ChatApp/src/network/protocol/packets/CreateRoomPacket.java +++ b/ChatApp/src/network/protocol/packets/CreateRoomPacket.java @@ -2,12 +2,9 @@ package network.protocol.packets; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class CreateRoomPacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - private final String roomName; public CreateRoomPacket(String roomName) { diff --git a/ChatApp/src/network/protocol/packets/JoinRoomPacket.java b/ChatApp/src/network/protocol/packets/JoinRoomPacket.java index a3b3173..136ee8b 100644 --- a/ChatApp/src/network/protocol/packets/JoinRoomPacket.java +++ b/ChatApp/src/network/protocol/packets/JoinRoomPacket.java @@ -2,12 +2,9 @@ package network.protocol.packets; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class JoinRoomPacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - private final String roomName; public JoinRoomPacket(String roomName) { diff --git a/ChatApp/src/network/protocol/packets/LeaveRoomPacket.java b/ChatApp/src/network/protocol/packets/LeaveRoomPacket.java index 2200dc8..02574b8 100644 --- a/ChatApp/src/network/protocol/packets/LeaveRoomPacket.java +++ b/ChatApp/src/network/protocol/packets/LeaveRoomPacket.java @@ -2,12 +2,9 @@ package network.protocol.packets; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class LeaveRoomPacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - public LeaveRoomPacket() { } diff --git a/ChatApp/src/network/protocol/packets/LoginPacket.java b/ChatApp/src/network/protocol/packets/LoginPacket.java index 237dd3f..a354193 100644 --- a/ChatApp/src/network/protocol/packets/LoginPacket.java +++ b/ChatApp/src/network/protocol/packets/LoginPacket.java @@ -2,12 +2,9 @@ package network.protocol.packets; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class LoginPacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - private final String pseudo; public LoginPacket(String pseudo) { diff --git a/ChatApp/src/network/protocol/packets/RequestRoomListPacket.java b/ChatApp/src/network/protocol/packets/RequestRoomListPacket.java index da267ba..7eb70e0 100644 --- a/ChatApp/src/network/protocol/packets/RequestRoomListPacket.java +++ b/ChatApp/src/network/protocol/packets/RequestRoomListPacket.java @@ -2,13 +2,9 @@ package network.protocol.packets; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class RequestRoomListPacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - - public RequestRoomListPacket() { } diff --git a/ChatApp/src/network/protocol/packets/RoomListPacket.java b/ChatApp/src/network/protocol/packets/RoomListPacket.java index 1ee7008..36b6196 100644 --- a/ChatApp/src/network/protocol/packets/RoomListPacket.java +++ b/ChatApp/src/network/protocol/packets/RoomListPacket.java @@ -4,12 +4,9 @@ import java.util.ArrayList; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class RoomListPacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - private final ArrayList roomNames; public RoomListPacket(ArrayList roomNames) { diff --git a/ChatApp/src/network/protocol/packets/SendChatMessagePacket.java b/ChatApp/src/network/protocol/packets/SendChatMessagePacket.java index 52a6b0b..3b7685c 100644 --- a/ChatApp/src/network/protocol/packets/SendChatMessagePacket.java +++ b/ChatApp/src/network/protocol/packets/SendChatMessagePacket.java @@ -2,12 +2,9 @@ package network.protocol.packets; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class SendChatMessagePacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - private final String content; public SendChatMessagePacket(String content) { diff --git a/ChatApp/src/network/protocol/packets/ServerResponsePacket.java b/ChatApp/src/network/protocol/packets/ServerResponsePacket.java index 91f8207..26439d6 100644 --- a/ChatApp/src/network/protocol/packets/ServerResponsePacket.java +++ b/ChatApp/src/network/protocol/packets/ServerResponsePacket.java @@ -2,12 +2,9 @@ package network.protocol.packets; import network.protocol.Packet; import network.protocol.PacketVisitor; -import network.protocol.Packets; public class ServerResponsePacket extends Packet { - static private final long serialVersionUID = Packets.Login.ordinal(); - public static enum Response { AuthSuccess, AuthError, RoomCreated, RoomNotCreated, RoomJoined, RoomNotJoined, NotInRoom, RoomLeft, RoomNotLeft, MessageSent, MessageNotSent; }; diff --git a/ChatApp/src/server/Server.java b/ChatApp/src/server/Server.java index 4cfa332..811af1c 100644 --- a/ChatApp/src/server/Server.java +++ b/ChatApp/src/server/Server.java @@ -11,10 +11,8 @@ import java.util.Map; import network.PacketHandler; import network.SocketReader; import network.protocol.Packet; -import network.protocol.Packets; import network.protocol.packets.ChatMessagePacket; import network.protocol.packets.SendChatMessagePacket; -import network.protocol.packets.ServerResponsePacket; public class Server implements PacketHandler {