added classes for client and server state machine

- a client state machine consits out of a 'ClientState' (every state of the machine) and a 'ClientStateMachine' (every state, which consists out of states), the machine starts with the ClientAutomaton
- analog for server
- started to implement logic for the server, transition from 'Lobby' to 'GameState'

Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Animation extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class AudioSettings extends Settings {
+public class AudioSettings extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
 public class Ceremony extends ClientState {
+    private final CeremonyStateMachine ceremonyStateMachine = new CeremonyStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class CeremonyStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class ChoosePiece extends Turn {
+public class ChoosePiece extends ClientState {
+    private final ChoosePieceStateMachine choosePieceStateMachine = new ChoosePieceStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class ChoosePieceStateMachine extends ClientStateMachine{
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class ChoosePowerCard extends PowerCard {
+public class ChoosePowerCard extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/ClientAutomaton.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class ClientAutomaton extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/ClientState.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class ClientState {
+public abstract class ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/ClientStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public abstract class ClientStateMachine extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class DetermineStartPlayer extends Game {
+public class DetermineStartPlayer extends ClientState {
+    private final DetermineStartPlayerStateMachine determineStartPlayerStateMachine = new DetermineStartPlayerStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class DetermineStartPlayerStateMachine extends ClientStateMachine{
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
 public class Dialogs extends ClientState {
+    private final DialogsStateMachine dialogsStateMachine = new DialogsStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class DialogsStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Game.java

@@ -1,4 +0,0 @@
-package pp.mdga.client;
-
-public class Game extends ClientState {
-}

Projekte/mdga/model/src/main/java/pp.mdga/client/GameState.java

@@ -0,0 +1,5 @@
+package pp.mdga.client;
+
+public class GameState extends ClientState {
+    private final GameStateMachine gameStateMachine = new GameStateMachine();
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class GameStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Lobby extends Dialogs {
+public class Lobby extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class MainSettings extends Settings {
+public class MainSettings extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class MovePiece extends Turn {
+public class MovePiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class NetworkDialog extends Dialogs {
+public class NetworkDialog extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class NoPiece extends ChoosePiece {
+public class NoPiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class PlayPowerCard extends PowerCard {
+public class PlayPowerCard extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Podium extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class PowerCard extends Turn {
+public class PowerCard extends ClientState {
+    private final PowerCardStateMachine powerCardStateMachine = new PowerCardStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class PowerCardStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class RollDice extends Turn {
+public class RollDice extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class RollRankingDice extends DetermineStartPlayer {
+public class RollRankingDice extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class SelectPiece extends ChoosePiece {
+public class SelectPiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class Settings {
+public class Settings extends ClientState {
+    private final SettingsStateMachine settingsStateMachine = new SettingsStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class SettingsStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Shield extends PowerCard {
+public class Shield extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Spectator extends Game {
+public class Spectator extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class StartPiece extends ChoosePiece {
+public class StartPiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Statistics extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Swap extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/SwitchEnemy.java

@@ -1,4 +0,0 @@
-package pp.mdga.client;
-
-public class SwitchEnemy extends PowerCard {
-}

Projekte/mdga/model/src/main/java/pp.mdga/client/SwitchOwn.java

@@ -1,4 +0,0 @@
-package pp.mdga.client;
-
-public class SwitchOwn extends PowerCard {
-}

Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class Turn extends Game {
+public class Turn extends ClientState {
+    private final TurnStateMachine turnStateMachine = new TurnStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class TurnStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class VideoSettings extends Settings {
+public class VideoSettings extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class WaitRanking extends DetermineStartPlayer {
+public class WaitRanking extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Waiting extends Game {
+public class Waiting extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class WaitingPiece extends ChoosePiece {
+public class WaitingPiece extends ClientState {
 }