diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java index f4140223..02a63715 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java @@ -7,4 +7,8 @@ public Dialogs(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.dialogsStateMachine = new DialogsStateMachine(parent, logic); } + + public DialogsStateMachine getDialogsStateMachine() { + return dialogsStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/Ceremony.java b/Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java similarity index 91% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/Ceremony.java rename to Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java index 3bff739c..10197038 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/Ceremony.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java @@ -6,11 +6,11 @@ * A message sent by the server to indicate the beginning of the ceremony. */ @Serializable -public class Ceremony extends ServerMessage { +public class CeremonyMessage extends ServerMessage { /** * Constructs a new Ceremony instance. */ - public Ceremony() { + public CeremonyMessage() { super(); } 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 e9dde28a..c83abefd 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 @@ -31,7 +31,7 @@ public interface ServerInterpreter { * * @param msg the Ceremony message received */ - void received(Ceremony msg); + void received(CeremonyMessage msg); /** * Handles a Dice message received from the server. diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java index 89020007..3fb1ff9a 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java @@ -26,7 +26,7 @@ public void receivedRequestDice(RequestDice msg, int from) { @Override public void update() { if (Boolean.TRUE.equals(logic.getGame().allRanked())) { - broadcastUpdate(new RankingResponce()); + broadcastUpdate(new RankingResponse()); if (logic.getGame().getOrder().isEmpty()) { // todo: save the players with the same value? broadcastUpdate(new RankingRollAgain()); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/GameState.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/GameState.java index dab977c8..79069220 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/GameState.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/GameState.java @@ -3,7 +3,7 @@ import pp.mdga.message.client.*; import pp.mdga.message.server.PauseGame; import pp.mdga.message.server.PossibleCard; -import pp.mdga.message.server.RankingResponce; +import pp.mdga.message.server.RankingResponse; public class GameState extends ServerState { private final GameStateMachine gameStateMachine = new GameStateMachine(this, logic); @@ -54,7 +54,7 @@ public void sentPossibleCard(PossibleCard msg, int from) { } @Override - public void sentRankingResponse(RankingResponce msg, int from) { + public void sentRankingResponse(RankingResponse msg, int from) { gameStateMachine.sentRankingResponse(msg, from); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerState.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerState.java index 90c08897..29bf2edd 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerState.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerState.java @@ -8,7 +8,7 @@ import pp.mdga.message.client.*; import pp.mdga.message.server.EndOfTurn; import pp.mdga.message.server.PossibleCard; -import pp.mdga.message.server.RankingResponce; +import pp.mdga.message.server.RankingResponse; import pp.mdga.message.server.ServerMessage; import java.lang.System.Logger; @@ -152,7 +152,7 @@ public void sentPossibleCard(PossibleCard msg, int from) { /* do nothing */ } * * @param msg the RankingResponce message */ - public void sentRankingResponse(RankingResponce msg, int from) { /* do nothing */ } + public void sentRankingResponse(RankingResponse msg, int from) { /* do nothing */ } /** * This method transitions to a new state. diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerStateMachine.java index 7c30384e..2554deaf 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerStateMachine.java @@ -3,7 +3,7 @@ import pp.mdga.message.client.*; import pp.mdga.message.server.EndOfTurn; import pp.mdga.message.server.PossibleCard; -import pp.mdga.message.server.RankingResponce; +import pp.mdga.message.server.RankingResponse; /** * Abstract class representing a state machine for the server. @@ -209,7 +209,7 @@ public void sentPossibleCard(PossibleCard msg, int from) { * @param msg the RankingResponse message */ @Override - public void sentRankingResponse(RankingResponce msg, int from) { + public void sentRankingResponse(RankingResponse msg, int from) { state.sentRankingResponse(msg, from); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java index 4be9f928..4202226f 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java @@ -1,10 +1,8 @@ package pp.mdga.server; -import pp.mdga.client.Spectator; import pp.mdga.game.Player; import pp.mdga.message.server.ActivePlayer; -import pp.mdga.message.server.Ceremony; -import pp.mdga.message.server.EndOfTurn; +import pp.mdga.message.server.CeremonyMessage; public class Turn extends ServerState { private final TurnStateMachine turnStateMachine = new TurnStateMachine(this, logic); @@ -25,7 +23,7 @@ public void exit() { // } if (logic.getGame().getPlayers().size() == 1) { - broadcastUpdate(new Ceremony()); + broadcastUpdate(new CeremonyMessage()); this.getParent().getParent().exit(); } else { // todo: next player