diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java index b7008403..8c7e6238 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java @@ -66,4 +66,9 @@ public Node[] getInfield() { public void setPieceOnBoard(int index, Piece piece) { infield[index].setOccupant(piece); } + + @Override + public String toString(){ + return "Default Board"; + } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java index 41cb92f1..a9254fb6 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java @@ -254,4 +254,9 @@ public void setActive(boolean active) { public void setPieceInHome(int index, Piece piece) { this.homeNodes[index].setOccupant(piece); } + + @Override + public String toString(){ + return "Player: " + name + " Color: " + color; + } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/AnimationEndMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/AnimationEndMessage.java index ce605771..d2bf0e2d 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/AnimationEndMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/AnimationEndMessage.java @@ -14,16 +14,6 @@ public AnimationEndMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "AnimationEnd{}"; - } - /** * Accepts a visitor for processing this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientMessage.java index 35a22cf2..3773ef6c 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientMessage.java @@ -21,4 +21,8 @@ protected ClientMessage() { * @param from the connection ID of the sender */ public abstract void accept(ClientInterpreter interpreter, int from); + + public String toString() { + return getClass().getSimpleName() + "{}"; + } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientStartGameMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientStartGameMessage.java index f0eac332..39a260e3 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientStartGameMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientStartGameMessage.java @@ -24,14 +24,4 @@ public ClientStartGameMessage() { public void accept(ClientInterpreter interpreter, int from) { interpreter.received(this, from); } - - /** - * This method will be used to return all necessary information of StartGameMessage in a more readable way. - * - * @return information as a String. - */ - @Override - public String toString() { - return "ClientStartGameMessage{}"; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/DisconnectedMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/DisconnectedMessage.java index ee85fae3..c64663b8 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/DisconnectedMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/DisconnectedMessage.java @@ -11,16 +11,6 @@ public DisconnectedMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "ClientStartGame{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceContinueGameMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceContinueGameMessage.java index e654ea77..393afba8 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceContinueGameMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceContinueGameMessage.java @@ -14,16 +14,6 @@ public ForceContinueGameMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "ForceContinueGame{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/JoinedLobbyMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/JoinedLobbyMessage.java index ab1a0524..7b4f862a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/JoinedLobbyMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/JoinedLobbyMessage.java @@ -42,7 +42,7 @@ public String getName(){ */ @Override public String toString() { - return "JoinServer{}"; + return "JoinServer {" + "name=" + name + '}'; } /** diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LeaveGameMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LeaveGameMessage.java index 48b2d324..3fb0b222 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LeaveGameMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LeaveGameMessage.java @@ -14,16 +14,6 @@ public LeaveGameMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "LeaveGame{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyNotReadyMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyNotReadyMessage.java index d0b966c8..4f8eedc7 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyNotReadyMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyNotReadyMessage.java @@ -14,16 +14,6 @@ public LobbyNotReadyMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "LobbyNotReady{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyReadyMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyReadyMessage.java index 47da4de6..73dbf408 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyReadyMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyReadyMessage.java @@ -14,16 +14,6 @@ public LobbyReadyMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "LobbyReady{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/NoPowerCardMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/NoPowerCardMessage.java index c37f5787..09d28423 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/NoPowerCardMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/NoPowerCardMessage.java @@ -14,16 +14,6 @@ public NoPowerCardMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "NoPowerCard{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestBriefingMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestBriefingMessage.java index b47694ba..c0ccd55d 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestBriefingMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestBriefingMessage.java @@ -14,16 +14,6 @@ public RequestBriefingMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "RequestBriefing{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestDieMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestDieMessage.java index 52e09924..5367499c 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestDieMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestDieMessage.java @@ -14,16 +14,6 @@ public RequestDieMessage() { super(); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "RequestDie{}"; - } - /** * Accepts a visitor to process this message. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java index 3b314cc9..231a0d03 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCardMessage.java @@ -98,7 +98,8 @@ public UUID getEnemyPieceIdentifier() { */ @Override public String toString() { - return "RequestPlayCard={card=" + card.toString() + '}'; + assert card != null; + return "RequestPlayCard={card=" + card + '}'; } /** diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ActivePlayerMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ActivePlayerMessage.java index 3c7e8961..01440aeb 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ActivePlayerMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ActivePlayerMessage.java @@ -58,14 +58,4 @@ public void accept(ServerInterpreter interpreter) { public String toString() { return "ActivePlayer{color=" + color + '}'; } - - /** - * Returns the key for the informational text associated with this message. - * - * @return the key for the informational text - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/AnyPieceMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/AnyPieceMessage.java index a1780318..68fe30f2 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/AnyPieceMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/AnyPieceMessage.java @@ -61,14 +61,4 @@ public void accept(ServerInterpreter interpreter) { public String toString() { return "AnyPiece{piece=" + piece + '}'; } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/BriefingMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/BriefingMessage.java index 1f077d61..509a834b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/BriefingMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/BriefingMessage.java @@ -23,24 +23,4 @@ public BriefingMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/CeremonyMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/CeremonyMessage.java index 10197038..60a14301 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/CeremonyMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/CeremonyMessage.java @@ -23,24 +23,4 @@ public CeremonyMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceAgainMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceAgainMessage.java index 09d57ffb..b8e5a935 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceAgainMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceAgainMessage.java @@ -23,24 +23,4 @@ public DiceAgainMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceNowMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceNowMessage.java index 7a31fa38..ee230a0e 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceNowMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceNowMessage.java @@ -23,24 +23,4 @@ public DiceNowMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DieMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DieMessage.java index abf018a9..cff6b903 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DieMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DieMessage.java @@ -57,16 +57,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "DieMessage{" + "diceEye=" + diceEye + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/EndOfTurnMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/EndOfTurnMessage.java index 10dabd02..dcb2f30a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/EndOfTurnMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/EndOfTurnMessage.java @@ -23,24 +23,4 @@ public EndOfTurnMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/IncorrectRequestMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/IncorrectRequestMessage.java index df51705b..8470ef9a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/IncorrectRequestMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/IncorrectRequestMessage.java @@ -34,18 +34,6 @@ public IncorrectRequestMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Gets the bundle key of the informational text to be shown at the client. - * This key is used to retrieve the appropriate localized text for display. - * - * @return the bundle key of the informational text - */ - @Override - public String getInfoTextKey() { - return ""; - } - /** * This method will be used to return necessary class information in a more readable format. * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyAcceptMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyAcceptMessage.java index fbaf7c56..3e8f18cc 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyAcceptMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyAcceptMessage.java @@ -39,7 +39,6 @@ public int getHost() { return this.host; } - /** * Accepts a visitor to process this message. * @@ -51,22 +50,12 @@ public void accept(ServerInterpreter interpreter) { } /** - * Returns a string representation of this message. + * This method will be used to return necessary class information in a more readable format. * - * @return a string representation of this message + * @return information as a String. */ @Override public String toString() { - return "Lobby Accept"; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "LobbyAcceptMessage with host: %d".formatted(this.host); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyDenyMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyDenyMessage.java index ea5299ee..5f63bf40 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyDenyMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyDenyMessage.java @@ -23,24 +23,4 @@ public LobbyDenyMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return "LobbyDeny"; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerJoinedMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerJoinedMessage.java index fdc5ede4..1feb0e5a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerJoinedMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerJoinedMessage.java @@ -79,23 +79,8 @@ public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "LobbyPlayerJoinedMessage{" + "player=" + player + ", id=" + id + ", host=" + host + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerLeaveMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerLeaveMessage.java index 328e3242..aac97869 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerLeaveMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerLeaveMessage.java @@ -56,16 +56,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "LobbyPlayerLeaveMessage{" + "id=" + id + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/MoveMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/MoveMessage.java index 4d4f6604..01e3ff77 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/MoveMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/MoveMessage.java @@ -89,16 +89,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "MoveMessage{" + "pieceUUID=" + pieceUUID + ", targetIndex=" + targetIndex + ", isHomeMove=" + isHomeMove + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/NoTurnMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/NoTurnMessage.java index 8240b2b7..3dac4548 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/NoTurnMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/NoTurnMessage.java @@ -23,24 +23,4 @@ public NoTurnMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PauseGameMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PauseGameMessage.java index 536a918f..ccb70503 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PauseGameMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PauseGameMessage.java @@ -54,16 +54,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "PauseGameMessage{" + "playerId=" + playerId + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PlayCardMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PlayCardMessage.java index 159b96c2..66b7e3ed 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PlayCardMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PlayCardMessage.java @@ -135,16 +135,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "PlayCardMessage{" + "card=" + card + ", ownPieceID=" + ownPieceID + ", enemyPieceID=" + enemyPieceID + ", diceModifier=" + diceModifier + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCardMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCardMessage.java index bceea4d7..b34acb7b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCardMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCardMessage.java @@ -59,16 +59,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "PossibleCardMessage{" + "possibleCards=" + possibleCards + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossiblePieceMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossiblePieceMessage.java index cc551388..504840a1 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossiblePieceMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossiblePieceMessage.java @@ -33,7 +33,7 @@ public PossiblePieceMessage() { /** * Swap the possible pieces * - * @param possibleOwnPieces the list of possible own pieces + * @param possibleOwnPieces the list of possible own pieces * @param possibleEnemyPieces the list of possible enemy pieces * @return the swapped possible pieces */ @@ -50,7 +50,7 @@ public static PossiblePieceMessage swapPossiblePieces(ArrayList possibleOw * @param possibleOwnPieces the list of possible own pieces * @return the possible pieces for the shield */ - public static PossiblePieceMessage shieldPossiblePieces(ArrayList possibleOwnPieces){ + public static PossiblePieceMessage shieldPossiblePieces(ArrayList possibleOwnPieces) { PossiblePieceMessage possiblePieceMessage = new PossiblePieceMessage(); possiblePieceMessage.possibleOwnPieces.addAll(possibleOwnPieces); return possiblePieceMessage; @@ -74,14 +74,18 @@ public void addEnemyPossiblePiece(UUID piece) { this.possibleEnemyPieces.add(piece); } - /** Getter for the list of possible pieces + /** + * Getter for the list of possible pieces + * * @return the list of possible pieces */ public List getOwnPossiblePieces() { return possibleOwnPieces; } - /** Getter for the list of possible enemy pieces + /** + * Getter for the list of possible enemy pieces + * * @return the list of possible enemy pieces */ public List getEnemyPossiblePieces() { @@ -105,16 +109,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "PossiblePieceMessage{" + "possibleOwnPieces=" + possibleOwnPieces + ", possibleEnemyPieces=" + possibleEnemyPieces + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingResponseMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingResponseMessage.java index 3c8e263d..604b1d89 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingResponseMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingResponseMessage.java @@ -52,16 +52,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "RankingResponseMessage{" + "startingPlayerId=" + startingPlayerId + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingRollAgainMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingRollAgainMessage.java index f89df585..56d82cd3 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingRollAgainMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingRollAgainMessage.java @@ -23,24 +23,4 @@ public RankingRollAgainMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ReconnectBriefingMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ReconnectBriefingMessage.java index 4a1495e6..9e5aeb1f 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ReconnectBriefingMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ReconnectBriefingMessage.java @@ -54,16 +54,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "ReconnectBriefingMessage{" + "game=" + game + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ResumeGameMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ResumeGameMessage.java index c95541c0..9e1f349b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ResumeGameMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ResumeGameMessage.java @@ -23,24 +23,4 @@ public ResumeGameMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Returns a string representation of this message. - * - * @return a string representation of this message - */ - @Override - public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SelectPieceMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SelectPieceMessage.java index da229a19..601160a9 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SelectPieceMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SelectPieceMessage.java @@ -77,7 +77,7 @@ public void accept(ServerInterpreter interpreter) { * @return a string representation of this message */ @Override - public String getInfoTextKey() { - return ""; + public String toString() { + return "SelectPieceMessage{" + "pieces=" + pieces + ", isHomeMove=" + isHomeMove + ", targetIndex=" + targetIndex + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerMessage.java index bc1d6b7d..c67b70bd 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerMessage.java @@ -22,10 +22,12 @@ protected ServerMessage() { public abstract void accept(ServerInterpreter interpreter); /** - * Gets the bundle key of the informational text to be shown at the client. - * This key is used to retrieve the appropriate localized text for display. + * Returns a string representation of this message. * - * @return the bundle key of the informational text + * @return a string representation of this message */ - public abstract String getInfoTextKey(); + @Override + public String toString() { + return getClass().getSimpleName() + "{}"; + } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerStartGameMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerStartGameMessage.java index 342d0e9d..7017a89a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerStartGameMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerStartGameMessage.java @@ -74,16 +74,7 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; + return "ServerStartGameMessage{" + "players=" + players + ", board=" + board + '}'; } - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ShutdownMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ShutdownMessage.java index 8c898f03..ad4aa70a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ShutdownMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ShutdownMessage.java @@ -16,15 +16,4 @@ public class ShutdownMessage extends ServerMessage { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - /** - * Gets the bundle key of the informational text to be shown at the client. - * This key is used to retrieve the appropriate localized text for display. - * - * @return the bundle key of the informational text - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SpectatorMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SpectatorMessage.java index 6ebc7b23..1c7287b4 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SpectatorMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/SpectatorMessage.java @@ -5,7 +5,7 @@ */ public class SpectatorMessage extends ServerMessage { /** - * Construc + * Constructor */ public SpectatorMessage() { super(); @@ -19,14 +19,4 @@ public SpectatorMessage() { public void accept(ServerInterpreter interpreter) { interpreter.received(this); } - - - /** - * - * @return - */ - @Override - public String getInfoTextKey() { - return ""; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/StartPieceMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/StartPieceMessage.java index c8cb5aa0..c14dd3b8 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/StartPieceMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/StartPieceMessage.java @@ -75,16 +75,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "StartPieceMessage{" + "pieceIdentifier=" + pieceIdentifier + ", targetIndex=" + targetIndex + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateReadyMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateReadyMessage.java index d8d53313..97a8989b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateReadyMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateReadyMessage.java @@ -73,16 +73,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "UpdateReadyMessage{" + "playerId=" + playerId + ", ready=" + ready + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateTSKMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateTSKMessage.java index 2da6f682..f1038659 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateTSKMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateTSKMessage.java @@ -58,6 +58,15 @@ public Color getColor() { return color; } + /** + * Checks if the TSK is taken. + * + * @return true if the TSK is taken, false otherwise + */ + public boolean isTaken() { + return isTaken; + } + /** * Accepts a visitor to process this message. * @@ -75,20 +84,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; - } - - public boolean isTaken() { - return isTaken; + return "UpdateTSKMessage{" + "id=" + id + ", color=" + color + '}'; } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/WaitPieceMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/WaitPieceMessage.java index 528ebbe2..fa425790 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/WaitPieceMessage.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/WaitPieceMessage.java @@ -54,16 +54,6 @@ public void accept(ServerInterpreter interpreter) { */ @Override public String toString() { - return ""; - } - - /** - * Returns the key for the info text of this message. - * - * @return the key for the info text of this message - */ - @Override - public String getInfoTextKey() { - return ""; + return "WaitPieceMessage{" + "pieceID=" + pieceID + '}'; } }