From 8f0ccbfa369a78fc4e8a98d2494d3c49966b713d Mon Sep 17 00:00:00 2001 From: Sebastian Lenzlinger Date: Sat, 26 Mar 2022 10:53:22 +0100 Subject: [PATCH] Fixed InputToProtocolMap to now contain a encoding map from client input to protocol msg and a set of legal client inputs. --- .../cs108/Klassenstruktur/GhostPlayer.java | 4 +-- .../cs108/Klassenstruktur/HumanPlayer.java | 4 +-- .../dbis/cs108/Klassenstruktur/Passenger.java | 4 +-- .../Client/InputToProtocolMap.java | 16 --------- .../Client => multiplayer/client}/Client.java | 2 +- .../client}/EmptyClientInputException.java | 2 +- .../client/InputToProtocolMap.java | 33 +++++++++++++++++++ .../client}/NTtBProtocolParser.java | 2 +- .../client}/ProtocolParser.java | 2 +- .../helpers/ClientPinger.java | 2 +- .../helpers/ServerPinger.java | 2 +- .../protocol}/NTtBFormatMsg.java | 2 +- .../protocol}/NTtBInputType.java | 2 +- .../protocol}/NTtBParameter.java | 2 +- .../protocol}/NTtB_Protocol_Definition.txt | 0 .../protocol}/NightTrainProtocol.java | 2 +- ...alProtocolCommandStringFoundException.java | 2 +- .../protocol}/ProtocolDecoder.java | 2 +- .../protocol}/ProtocolValidator.java | 2 +- .../server}/ClientHandler.java | 2 +- .../server}/ClientMsgDecoder.java | 16 ++++----- .../server}/InSessionLogik.java | 2 +- .../server}/NoCommandTokenException.java | 2 +- .../Server => multiplayer/server}/Server.java | 2 +- .../server}/connectingLogik.java | 2 +- 25 files changed, 62 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/InputToProtocolMap.java rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Client => multiplayer/client}/Client.java (98%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Client => multiplayer/client}/EmptyClientInputException.java (87%) create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/InputToProtocolMap.java rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Client => multiplayer/client}/NTtBProtocolParser.java (97%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Client => multiplayer/client}/ProtocolParser.java (84%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer => multiplayer}/helpers/ClientPinger.java (97%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer => multiplayer}/helpers/ServerPinger.java (97%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/NTtBFormatMsg.java (96%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/NTtBInputType.java (68%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/NTtBParameter.java (86%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/NTtB_Protocol_Definition.txt (100%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/NightTrainProtocol.java (97%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/NoLegalProtocolCommandStringFoundException.java (58%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/ProtocolDecoder.java (61%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Protocol => multiplayer/protocol}/ProtocolValidator.java (92%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Server => multiplayer/server}/ClientHandler.java (98%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Server => multiplayer/server}/ClientMsgDecoder.java (85%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Server => multiplayer/server}/InSessionLogik.java (71%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Server => multiplayer/server}/NoCommandTokenException.java (53%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Server => multiplayer/server}/Server.java (96%) rename src/main/java/ch/unibas/dmi/dbis/cs108/{Multiplayer/Server => multiplayer/server}/connectingLogik.java (76%) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java index 3e8dd94..3e61bf9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java @@ -1,8 +1,6 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; -import ch.unibas.dmi.dbis.cs108.Multiplayer.Server.ClientHandler; - -import java.net.Socket; +import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler; public class GhostPlayer extends Ghost{ diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java index f478a6d..934e760 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java @@ -1,8 +1,6 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; -import ch.unibas.dmi.dbis.cs108.Multiplayer.Server.ClientHandler; - -import java.net.Socket; +import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler; public class HumanPlayer extends Human{ /** diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java index 14a6dbd..373f171 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java @@ -1,8 +1,6 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; -import ch.unibas.dmi.dbis.cs108.Multiplayer.Server.ClientHandler; - -import java.net.Socket; +import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler; public class Passenger { protected int position; //the player's Cabin number (0 to 5) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/InputToProtocolMap.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/InputToProtocolMap.java deleted file mode 100644 index f93f903..0000000 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/InputToProtocolMap.java +++ /dev/null @@ -1,16 +0,0 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Client; - -import ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol.NightTrainProtocol; - -import java.util.HashMap; - -public class InputToProtocolMap extends HashMap { - public InputToProtocolMap(){ - super(); - this.put("chat", NightTrainProtocol.NTtBCommands.CHATA); - this.put("cn", NightTrainProtocol.NTtBCommands.CUSRN); - this.put("list", NightTrainProtocol.NTtBCommands.LISTP); - this.put("exit", NightTrainProtocol.NTtBCommands.LEAVG); - //TODO extend according to extended function - } -} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java similarity index 98% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java index 1f04751..e2cab2b 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Client; +package ch.unibas.dmi.dbis.cs108.multiplayer.client; import java.net.Socket; import java.io.*; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/EmptyClientInputException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/EmptyClientInputException.java similarity index 87% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/EmptyClientInputException.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/EmptyClientInputException.java index 5355675..6d9f814 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/EmptyClientInputException.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/EmptyClientInputException.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Client; +package ch.unibas.dmi.dbis.cs108.multiplayer.client; public class EmptyClientInputException extends Exception { String exceptionMsg; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/InputToProtocolMap.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/InputToProtocolMap.java new file mode 100644 index 0000000..f5dbfee --- /dev/null +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/InputToProtocolMap.java @@ -0,0 +1,33 @@ +package ch.unibas.dmi.dbis.cs108.multiplayer.client; + +import ch.unibas.dmi.dbis.cs108.multiplayer.protocol.NightTrainProtocol; + +import java.util.HashMap; +import java.util.HashSet; + +public class InputToProtocolMap { + + private static final HashMap encoding; + private static final HashSet legalClientInput; + + static { + //First add all legal commands to a map + HashMap builder = new HashMap<>(); + builder.put("chat", NightTrainProtocol.NTtBCommands.CHATA); + builder.put("cn", NightTrainProtocol.NTtBCommands.CUSRN); + builder.put("list", NightTrainProtocol.NTtBCommands.LISTP); + builder.put("exit", NightTrainProtocol.NTtBCommands.LEAVG); + //TODO extend according to extended function + //Initialize static final map and set + legalClientInput = new HashSet<>(builder.keySet()); + encoding = new HashMap<>(builder); + } + + public static String encode(String toEncode) { + if (legalClientInput.contains(toEncode)) { + return encoding.get(toEncode).toString(); + } + } + + +} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/NTtBProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/NTtBProtocolParser.java similarity index 97% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/NTtBProtocolParser.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/NTtBProtocolParser.java index f14947c..890c777 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/NTtBProtocolParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/NTtBProtocolParser.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Client; +package ch.unibas.dmi.dbis.cs108.multiplayer.client; import java.util.ArrayList; import java.util.Scanner; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/ProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/ProtocolParser.java similarity index 84% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/ProtocolParser.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/ProtocolParser.java index 6dbcebd..09c1197 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/ProtocolParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/ProtocolParser.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Client; +package ch.unibas.dmi.dbis.cs108.multiplayer.client; public interface ProtocolParser { /** diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/helpers/ClientPinger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java similarity index 97% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/helpers/ClientPinger.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java index 6e565e0..a5f764d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/helpers/ClientPinger.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.helpers; +package ch.unibas.dmi.dbis.cs108.multiplayer.helpers; import java.io.BufferedWriter; import java.io.IOException; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/helpers/ServerPinger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java similarity index 97% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/helpers/ServerPinger.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java index 83ca36a..fcc767e 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/helpers/ServerPinger.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.helpers; +package ch.unibas.dmi.dbis.cs108.multiplayer.helpers; import java.io.BufferedWriter; import java.io.IOException; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBFormatMsg.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBFormatMsg.java similarity index 96% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBFormatMsg.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBFormatMsg.java index 1c6da22..71a91fe 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBFormatMsg.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBFormatMsg.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol; +package ch.unibas.dmi.dbis.cs108.multiplayer.protocol; import java.util.LinkedList; import java.util.Queue; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBInputType.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBInputType.java similarity index 68% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBInputType.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBInputType.java index 8daca24..6f1d378 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBInputType.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBInputType.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol; +package ch.unibas.dmi.dbis.cs108.multiplayer.protocol; public interface NTtBInputType { String msg = null; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBParameter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBParameter.java similarity index 86% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBParameter.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBParameter.java index 43b41a2..3169953 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtBParameter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtBParameter.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol; +package ch.unibas.dmi.dbis.cs108.multiplayer.protocol; public class NTtBParameter implements NTtBInputType { String parameterValue; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtB_Protocol_Definition.txt b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtB_Protocol_Definition.txt similarity index 100% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NTtB_Protocol_Definition.txt rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NTtB_Protocol_Definition.txt diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NightTrainProtocol.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NightTrainProtocol.java similarity index 97% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NightTrainProtocol.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NightTrainProtocol.java index da7ad1d..1a49d12 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NightTrainProtocol.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NightTrainProtocol.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol; +package ch.unibas.dmi.dbis.cs108.multiplayer.protocol; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NoLegalProtocolCommandStringFoundException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NoLegalProtocolCommandStringFoundException.java similarity index 58% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NoLegalProtocolCommandStringFoundException.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NoLegalProtocolCommandStringFoundException.java index cd6d980..4d7f035 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/NoLegalProtocolCommandStringFoundException.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/NoLegalProtocolCommandStringFoundException.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol; +package ch.unibas.dmi.dbis.cs108.multiplayer.protocol; public class NoLegalProtocolCommandStringFoundException extends Exception { } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/ProtocolDecoder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/ProtocolDecoder.java similarity index 61% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/ProtocolDecoder.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/ProtocolDecoder.java index a54e21d..2a3d970 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/ProtocolDecoder.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/ProtocolDecoder.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol; +package ch.unibas.dmi.dbis.cs108.multiplayer.protocol; public interface ProtocolDecoder { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/ProtocolValidator.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/ProtocolValidator.java similarity index 92% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/ProtocolValidator.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/ProtocolValidator.java index 48318d0..d3617e9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Protocol/ProtocolValidator.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/protocol/ProtocolValidator.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol; +package ch.unibas.dmi.dbis.cs108.multiplayer.protocol; import java.util.EnumSet; import java.util.HashSet; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java similarity index 98% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientHandler.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java index dd86d8f..3e7f95f 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Server; +package ch.unibas.dmi.dbis.cs108.multiplayer.server; import java.io.*; import java.net.Socket; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientMsgDecoder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientMsgDecoder.java similarity index 85% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientMsgDecoder.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientMsgDecoder.java index 3a8ad5b..0baa43f 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientMsgDecoder.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientMsgDecoder.java @@ -1,9 +1,9 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Server; +package ch.unibas.dmi.dbis.cs108.multiplayer.server; -import ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol.NTtBFormatMsg; -import ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol.NightTrainProtocol; -import ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol.NoLegalProtocolCommandStringFoundException; -import ch.unibas.dmi.dbis.cs108.Multiplayer.Protocol.ProtocolDecoder; +import ch.unibas.dmi.dbis.cs108.multiplayer.protocol.NTtBFormatMsg; +import ch.unibas.dmi.dbis.cs108.multiplayer.protocol.NightTrainProtocol; +import ch.unibas.dmi.dbis.cs108.multiplayer.protocol.NoLegalProtocolCommandStringFoundException; +import ch.unibas.dmi.dbis.cs108.multiplayer.protocol.ProtocolDecoder; import java.util.LinkedList; import java.util.List; @@ -43,10 +43,10 @@ public class ClientMsgDecoder implements ProtocolDecoder { StringBuilder sb = new StringBuilder(); //assumes not empty list! NightTrainProtocol.NTtBCommands cmd = getCommandConstant(msgTokens.get(0)); - sb.append("Server msg: "); - sb.append("Command *" + cmd.toString() + "* recieved"); + sb.append("SERVER: "); + sb.append("Command *" + cmd.toString() + "* recieved!"); - return null; + return sb.toString(); } //Uses the NightTrainProtocol classes utility method diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/InSessionLogik.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/InSessionLogik.java similarity index 71% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/InSessionLogik.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/InSessionLogik.java index 7b44fb2..a68a851 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/InSessionLogik.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/InSessionLogik.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Server; +package ch.unibas.dmi.dbis.cs108.multiplayer.server; public class InSessionLogik { Server server; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/NoCommandTokenException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/NoCommandTokenException.java similarity index 53% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/NoCommandTokenException.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/NoCommandTokenException.java index 8e4a542..f707144 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/NoCommandTokenException.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/NoCommandTokenException.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Server; +package ch.unibas.dmi.dbis.cs108.multiplayer.server; public class NoCommandTokenException extends Exception { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/Server.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java similarity index 96% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/Server.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java index b2cd806..4939f6b 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/Server.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Server; +package ch.unibas.dmi.dbis.cs108.multiplayer.server; import java.io.*; import java.net.ServerSocket; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/connectingLogik.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/connectingLogik.java similarity index 76% rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/connectingLogik.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/connectingLogik.java index e6dbd6c..53b31d5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/connectingLogik.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/connectingLogik.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.Multiplayer.Server; +package ch.unibas.dmi.dbis.cs108.multiplayer.server; /** * Implements the communication protocol in the connecting phase.