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);

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);
     }
 

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());
     }
 

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);
     }
 

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);
     }
 

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);
     }
 

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<PowerCard>)msg.getPossibleCards();
         ArrayList<BonusCard> possibleBonusCards = new ArrayList<>();
         for (PowerCard card : possibleCards) {

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) {

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<PowerCard> possibleCards) {
+    public PossibleCardsMessage(List<PowerCard> possibleCards) {
         this.possibleCards = possibleCards;
     }
 

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.