From b601ff2cf720fb4f137ea95e170a02aa1627d33d Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Fri, 6 Dec 2024 00:36:06 +0100 Subject: [PATCH] renamed 'PossibleCardMEssage' to 'PossibleCardsMessage' and completed JavaDocs for method 'getPowerCardByType' in 'Player' --- .../src/main/java/pp/mdga/client/server/MdgaServer.java | 2 +- .../model/src/main/java/pp/mdga/client/ClientGameLogic.java | 2 +- .../model/src/main/java/pp/mdga/client/ClientState.java | 2 +- .../mdga/model/src/main/java/pp/mdga/client/GameState.java | 2 +- .../src/main/java/pp/mdga/client/gamestate/TurnState.java | 2 +- .../pp/mdga/client/gamestate/turnstate/PowerCardState.java | 4 ++-- .../turnstate/powercardstate/ChoosePowerCardState.java | 5 ++--- Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java | 6 +++--- .../{PossibleCardMessage.java => PossibleCardsMessage.java} | 6 +++--- .../main/java/pp/mdga/message/server/ServerInterpreter.java | 2 +- 10 files changed, 16 insertions(+), 17 deletions(-) rename Projekte/mdga/model/src/main/java/pp/mdga/message/server/{PossibleCardMessage.java => PossibleCardsMessage.java} (90%) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java index 19c517e5..d7188e20 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java @@ -124,7 +124,7 @@ private void initializeSerializables() { Serializer.registerClass(NoTurnMessage.class); Serializer.registerClass(PauseGameMessage.class); Serializer.registerClass(PlayCardMessage.class); - Serializer.registerClass(PossibleCardMessage.class); + Serializer.registerClass(PossibleCardsMessage.class); Serializer.registerClass(PossiblePieceMessage.class); Serializer.registerClass(RankingResponseMessage.class); Serializer.registerClass(RankingRollAgainMessage.class); diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java index 02b5ff76..391e7c01 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java @@ -330,7 +330,7 @@ public void received(PlayCardMessage msg) { * @param msg the PossibleCard message received */ @Override - public void received(PossibleCardMessage msg) { + public void received(PossibleCardsMessage msg) { state.received(msg); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java index 998ea5a7..c81e56d6 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java @@ -116,7 +116,7 @@ public void received(PlayCardMessage msg) { } @Override - public void received(PossibleCardMessage msg) { + public void received(PossibleCardsMessage msg) { LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString()); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java index fbfc0e57..be38d370 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java @@ -241,7 +241,7 @@ public void received(DiceAgainMessage msg){ * @param msg the message to be received */ @Override - public void received(PossibleCardMessage msg){ + public void received(PossibleCardsMessage msg){ state.received(msg); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java index 9c27854d..db28af7a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java @@ -108,7 +108,7 @@ public void received(DiceAgainMessage msg){ } @Override - public void received(PossibleCardMessage msg){ + public void received(PossibleCardsMessage msg){ state.received(msg); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java index 85a977d5..1a8a05a7 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java @@ -11,7 +11,7 @@ import pp.mdga.game.Piece; import pp.mdga.message.server.DiceNowMessage; import pp.mdga.message.server.PlayCardMessage; -import pp.mdga.message.server.PossibleCardMessage; +import pp.mdga.message.server.PossibleCardsMessage; import pp.mdga.message.server.PossiblePieceMessage; public class PowerCardState extends TurnStates { @@ -48,7 +48,7 @@ public void setState(PowerCardStates state) { } @Override - public void received(PossibleCardMessage msg){ + public void received(PossibleCardsMessage msg){ state.received(msg); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java index 0d624e92..11213b58 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java @@ -9,10 +9,9 @@ import pp.mdga.message.client.SelectCardMessage; import pp.mdga.message.server.DiceNowMessage; import pp.mdga.message.server.PlayCardMessage; -import pp.mdga.message.server.PossibleCardMessage; +import pp.mdga.message.server.PossibleCardsMessage; import pp.mdga.message.server.PossiblePieceMessage; import pp.mdga.notification.SelectableCardsNotification; -import pp.mdga.visitor.Visitor; import java.util.ArrayList; import java.util.stream.Collectors; @@ -56,7 +55,7 @@ public void exit() { * @param msg possible cards message */ @Override - public void received(PossibleCardMessage msg){ + public void received(PossibleCardsMessage msg){ possibleCards = (ArrayList)msg.getPossibleCards(); ArrayList possibleBonusCards = new ArrayList<>(); for (PowerCard card : possibleCards) { 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 31f9de1f..16a181d9 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 @@ -138,10 +138,10 @@ public boolean isFinished() { } /** - * This method returns a + * This method returns a PowerCard based on its Type. * - * @param bonusCard - * @return + * @param bonusCard the card Type to be matched + * @return the first PowerCard of this type */ public PowerCard getPowerCardByType(BonusCard bonusCard) { for (PowerCard card : this.handCards) { 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/PossibleCardsMessage.java similarity index 90% rename from Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCardMessage.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCardsMessage.java index 85b58682..bfd9b440 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/PossibleCardsMessage.java @@ -10,7 +10,7 @@ * A message sent by the server to the client to indicate the possible cards that can be chosen. */ @Serializable -public class PossibleCardMessage extends ServerMessage { +public class PossibleCardsMessage extends ServerMessage { /** * The list of possible cards. */ @@ -19,7 +19,7 @@ public class PossibleCardMessage extends ServerMessage { /** * Constructor for a PossibleCard instance. */ - public PossibleCardMessage() { + public PossibleCardsMessage() { super(); possibleCards = new ArrayList<>(); } @@ -29,7 +29,7 @@ public PossibleCardMessage() { * * @param possibleCards as the list of possible power cards as a List of PowerCard objects. */ - public PossibleCardMessage(List possibleCards) { + public PossibleCardsMessage(List possibleCards) { this.possibleCards = possibleCards; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerInterpreter.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerInterpreter.java index 67dcf802..6a9b0ddd 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerInterpreter.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerInterpreter.java @@ -122,7 +122,7 @@ public interface ServerInterpreter { * * @param msg the PossibleCard message received */ - void received(PossibleCardMessage msg); + void received(PossibleCardsMessage msg); /** * Handles a PossiblePiece message received from the server.