From 67a87ffa8164e3002f85132446e9dac71f15a958 Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sun, 24 Nov 2024 21:56:32 +0100 Subject: [PATCH] made all con structors of clients states public --- .../mdga/model/src/main/java/pp.mdga/client/Animation.java | 2 +- .../model/src/main/java/pp.mdga/client/AudioSettings.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/Ceremony.java | 6 +++++- .../src/main/java/pp.mdga/client/CeremonyStateMachine.java | 2 +- .../model/src/main/java/pp.mdga/client/ChoosePiece.java | 7 ++++++- .../main/java/pp.mdga/client/ChoosePieceStateMachine.java | 2 +- .../src/main/java/pp.mdga/client/ChoosePowerCard.java | 2 +- .../src/main/java/pp.mdga/client/ClientGameLogic.java | 1 - .../src/main/java/pp.mdga/client/DetermineStartPlayer.java | 6 +++++- .../pp.mdga/client/DetermineStartPlayerStateMachine.java | 2 +- .../src/main/java/pp.mdga/client/DialogsStateMachine.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/GameState.java | 6 +++++- .../src/main/java/pp.mdga/client/GameStateMachine.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/Interrupt.java | 3 --- .../mdga/model/src/main/java/pp.mdga/client/Lobby.java | 2 +- .../model/src/main/java/pp.mdga/client/MainSettings.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/MovePiece.java | 2 +- .../model/src/main/java/pp.mdga/client/NetworkDialog.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/NoPiece.java | 2 +- .../model/src/main/java/pp.mdga/client/PlayPowerCard.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/Podium.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/PowerCard.java | 6 +++++- .../main/java/pp.mdga/client/PowerCardStateMachine.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/RollDice.java | 2 +- .../src/main/java/pp.mdga/client/RollRankingDice.java | 2 +- .../model/src/main/java/pp.mdga/client/SelectPiece.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/Settings.java | 6 +++++- .../src/main/java/pp.mdga/client/SettingsStateMachine.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/Shield.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/Spectator.java | 2 +- .../model/src/main/java/pp.mdga/client/StartDialog.java | 2 +- .../model/src/main/java/pp.mdga/client/StartPiece.java | 2 +- .../model/src/main/java/pp.mdga/client/Statistics.java | 2 +- Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java | 2 +- Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java | 6 +++++- .../src/main/java/pp.mdga/client/TurnStateMachine.java | 2 +- .../model/src/main/java/pp.mdga/client/VideoSettings.java | 2 +- .../model/src/main/java/pp.mdga/client/WaitRanking.java | 2 +- .../mdga/model/src/main/java/pp.mdga/client/Waiting.java | 2 +- .../model/src/main/java/pp.mdga/client/WaitingPiece.java | 2 +- .../src/main/java/pp.mdga/notification/Notification.java | 4 ++++ 41 files changed, 71 insertions(+), 42 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java index 6cf3a398..6ed12c3b 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Animation extends ClientState { - protected Animation(ClientState parent, ClientGameLogic logic) { + public Animation(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java index dc273447..add83883 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class AudioSettings extends ClientState { - protected AudioSettings(ClientState parent, ClientGameLogic logic) { + public AudioSettings(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java index 9df52ddb..432f90f9 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java @@ -3,8 +3,12 @@ public class Ceremony extends ClientState { private final CeremonyStateMachine ceremonyStateMachine; - protected Ceremony(ClientState parent, ClientGameLogic logic) { + public Ceremony(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.ceremonyStateMachine = new CeremonyStateMachine(parent, logic); } + + public CeremonyStateMachine getCeremonyStateMachine() { + return ceremonyStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java index 371401c3..758950f8 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java @@ -2,7 +2,7 @@ public class CeremonyStateMachine extends ClientStateMachine { - protected CeremonyStateMachine(ClientState parent, ClientGameLogic logic) { + public CeremonyStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java index 4adedad0..828b12bd 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java @@ -1,10 +1,15 @@ package pp.mdga.client; public class ChoosePiece extends ClientState { + private final ChoosePieceStateMachine choosePieceStateMachine; - protected ChoosePiece(ClientState parent, ClientGameLogic logic) { + public ChoosePiece(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.choosePieceStateMachine = new ChoosePieceStateMachine(parent, logic); } + + public ChoosePieceStateMachine getChoosePieceStateMachine() { + return choosePieceStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java index 18a75c88..5346214c 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class ChoosePieceStateMachine extends ClientStateMachine{ - protected ChoosePieceStateMachine(ClientState parent, ClientGameLogic logic) { + public ChoosePieceStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java index db2bed4c..a11259b0 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class ChoosePowerCard extends ClientState { - protected ChoosePowerCard(ClientState parent, ClientGameLogic logic) { + public ChoosePowerCard(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } 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 a33fe82e..dcad3574 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 @@ -2,7 +2,6 @@ import pp.mdga.game.Game; import pp.mdga.message.client.ClientMessage; -import pp.mdga.server.ServerSender; public class ClientGameLogic { static final System.Logger LOGGER = System.getLogger(ClientGameLogic.class.getName()); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java index e06bc1b6..3a773bc8 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java @@ -3,8 +3,12 @@ public class DetermineStartPlayer extends ClientState { private final DetermineStartPlayerStateMachine determineStartPlayerStateMachine; - protected DetermineStartPlayer(ClientState parent, ClientGameLogic logic) { + public DetermineStartPlayer(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.determineStartPlayerStateMachine = new DetermineStartPlayerStateMachine(parent, logic); } + + public DetermineStartPlayerStateMachine getDetermineStartPlayerStateMachine() { + return determineStartPlayerStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java index d0153139..16c192c7 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class DetermineStartPlayerStateMachine extends ClientStateMachine{ - protected DetermineStartPlayerStateMachine(ClientState parent, ClientGameLogic logic) { + public DetermineStartPlayerStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java index f37b1a74..e1b833ad 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class DialogsStateMachine extends ClientStateMachine { - protected DialogsStateMachine(ClientState parent, ClientGameLogic logic) { + public DialogsStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } 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 35d5221c..8819c103 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 @@ -3,8 +3,12 @@ public class GameState extends ClientState { private final GameStateMachine gameStateMachine; - protected GameState(ClientState parent, ClientGameLogic logic) { + public GameState(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.gameStateMachine = new GameStateMachine(parent, logic); } + + public GameStateMachine getGameStateMachine() { + return gameStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java index 1a8a95de..4028c28e 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class GameStateMachine extends ClientStateMachine { - protected GameStateMachine(ClientState parent, ClientGameLogic logic) { + public GameStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Interrupt.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Interrupt.java index 4ce1e628..739a6bd2 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Interrupt.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Interrupt.java @@ -1,7 +1,5 @@ package pp.mdga.client; -import pp.mdga.server.GameState; - public class Interrupt extends ClientState { private final GameState lastState; @@ -11,4 +9,3 @@ public Interrupt(ClientState parent, ClientGameLogic logic, GameState lastState) this.lastState = lastState; } } - diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java index 8dbe6356..0f23c854 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Lobby extends ClientState { - protected Lobby(ClientState parent, ClientGameLogic logic) { + public Lobby(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java index 95fabebd..e8af6b05 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class MainSettings extends ClientState { - protected MainSettings(ClientState parent, ClientGameLogic logic) { + public MainSettings(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java index 1e3a148b..13bd9b85 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class MovePiece extends ClientState { - protected MovePiece(ClientState parent, ClientGameLogic logic) { + public MovePiece(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java index d065eaaf..8075ae90 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class NetworkDialog extends ClientState { - protected NetworkDialog(ClientState parent, ClientGameLogic logic) { + public NetworkDialog(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java index 55c15632..42375b01 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class NoPiece extends ClientState { - protected NoPiece(ClientState parent, ClientGameLogic logic) { + public NoPiece(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java index 3bf5f241..4278445f 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class PlayPowerCard extends ClientState { - protected PlayPowerCard(ClientState parent, ClientGameLogic logic) { + public PlayPowerCard(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java index 57532c1e..f962aa68 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Podium extends ClientState { - protected Podium(ClientState parent, ClientGameLogic logic) { + public Podium(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java index 62fb0d73..42ea2741 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java @@ -3,8 +3,12 @@ public class PowerCard extends ClientState { private final PowerCardStateMachine powerCardStateMachine; - protected PowerCard(ClientState parent, ClientGameLogic logic) { + public PowerCard(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.powerCardStateMachine = new PowerCardStateMachine(parent, logic); } + + public PowerCardStateMachine getPowerCardStateMachine() { + return powerCardStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java index 901d9d33..037417bc 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class PowerCardStateMachine extends ClientStateMachine { - protected PowerCardStateMachine(ClientState parent, ClientGameLogic logic) { + public PowerCardStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java index 6d5593de..4af7c7ad 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class RollDice extends ClientState { - protected RollDice(ClientState parent, ClientGameLogic logic) { + public RollDice(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java index a0b90bd6..f1a27dce 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class RollRankingDice extends ClientState { - protected RollRankingDice(ClientState parent, ClientGameLogic logic) { + public RollRankingDice(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java index 686b66bc..790e91b2 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class SelectPiece extends ClientState { - protected SelectPiece(ClientState parent, ClientGameLogic logic) { + public SelectPiece(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java index f274ac0e..a30942ab 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java @@ -3,8 +3,12 @@ public class Settings extends ClientState { private final SettingsStateMachine settingsStateMachine; - protected Settings(ClientState parent, ClientGameLogic logic) { + public Settings(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.settingsStateMachine = new SettingsStateMachine(parent, logic); } + + public SettingsStateMachine getSettingsStateMachine() { + return settingsStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java index 2ff5f8d4..0abb565e 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class SettingsStateMachine extends ClientStateMachine { - protected SettingsStateMachine(ClientState parent, ClientGameLogic logic) { + public SettingsStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java index 411ca30a..a3f205ba 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Shield extends ClientState { - protected Shield(ClientState parent, ClientGameLogic logic) { + public Shield(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java index a93fd2d1..293fc2b3 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Spectator extends ClientState { - protected Spectator(ClientState parent, ClientGameLogic logic) { + public Spectator(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/StartDialog.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/StartDialog.java index cc08d402..ee529941 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/StartDialog.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/StartDialog.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class StartDialog extends ClientState { - protected StartDialog(ClientState parent, ClientGameLogic logic) { + public StartDialog(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java index 7f6af3ea..7e52fd56 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class StartPiece extends ClientState { - protected StartPiece(ClientState parent, ClientGameLogic logic) { + public StartPiece(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java index 90b8a985..8eecb5ce 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Statistics extends ClientState { - protected Statistics(ClientState parent, ClientGameLogic logic) { + public Statistics(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java index 932a668e..da3ef3c5 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Swap extends ClientState { - protected Swap(ClientState parent, ClientGameLogic logic) { + public Swap(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java index f1eb1e02..3bdef5e6 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java @@ -3,8 +3,12 @@ public class Turn extends ClientState { private final TurnStateMachine turnStateMachine; - protected Turn(ClientState parent, ClientGameLogic logic) { + public Turn(ClientState parent, ClientGameLogic logic) { super(parent, logic); this.turnStateMachine = new TurnStateMachine(parent, logic); } + + public TurnStateMachine getTurnStateMachine() { + return turnStateMachine; + } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java index 4fac2958..60501cd8 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class TurnStateMachine extends ClientStateMachine { - protected TurnStateMachine(ClientState parent, ClientGameLogic logic) { + public TurnStateMachine(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java index 4bce32e4..0b397e1a 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class VideoSettings extends ClientState { - protected VideoSettings(ClientState parent, ClientGameLogic logic) { + public VideoSettings(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java index cbe8776a..b9db2175 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class WaitRanking extends ClientState { - protected WaitRanking(ClientState parent, ClientGameLogic logic) { + public WaitRanking(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java index 64838163..14a32cdf 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class Waiting extends ClientState { - protected Waiting(ClientState parent, ClientGameLogic logic) { + public Waiting(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java b/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java index 7932cb31..7b12a023 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java @@ -1,7 +1,7 @@ package pp.mdga.client; public class WaitingPiece extends ClientState { - protected WaitingPiece(ClientState parent, ClientGameLogic logic) { + public WaitingPiece(ClientState parent, ClientGameLogic logic) { super(parent, logic); } } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java index 3f8be5da..3302d8a3 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java @@ -1,4 +1,8 @@ package pp.mdga.notification; public abstract class Notification { + + public void accept(){ + + } }