added mor client state transitions

and renamed every client state with state as its suffix and renamed every message with messag as its suffix

Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java

@@ -86,71 +86,71 @@ private void processNextMessage() {
     }
 
     private void initializeSerializables() {
-        Serializer.registerClass(AnimationEnd.class);
-        Serializer.registerClass(ClientStartGame.class);
-        Serializer.registerClass(DeselectTSK.class);
-        Serializer.registerClass(ForceContinueGame.class);
-        Serializer.registerClass(StartGame.class);
-        Serializer.registerClass(JoinServer.class);
-        Serializer.registerClass(LeaveGame.class);
-        Serializer.registerClass(LobbyNotReady.class);
-        Serializer.registerClass(LobbyReady.class);
-        Serializer.registerClass(NoPowerCard.class);
-        Serializer.registerClass(RequestBriefing.class);
-        Serializer.registerClass(RequestDie.class);
-        Serializer.registerClass(RequestMove.class);
-        Serializer.registerClass(RequestPlayCard.class);
-        Serializer.registerClass(SelectCard.class);
-        Serializer.registerClass(SelectedPieces.class);
-        Serializer.registerClass(SelectTSK.class);
+        Serializer.registerClass(AnimationEndMessage.class);
+        Serializer.registerClass(ClientStartGameMessage.class);
+        Serializer.registerClass(DeselectTSKMessage.class);
+        Serializer.registerClass(ForceContinueGameMessage.class);
+        Serializer.registerClass(StartGameMessage.class);
+        Serializer.registerClass(JoinServerMessage.class);
+        Serializer.registerClass(LeaveGameMessage.class);
+        Serializer.registerClass(LobbyNotReadyMessage.class);
+        Serializer.registerClass(LobbyReadyMessage.class);
+        Serializer.registerClass(NoPowerCardMessage.class);
+        Serializer.registerClass(RequestBriefingMessage.class);
+        Serializer.registerClass(RequestDieMessage.class);
+        Serializer.registerClass(RequestMoveMessage.class);
+        Serializer.registerClass(RequestPlayCardMessage.class);
+        Serializer.registerClass(SelectCardMessage.class);
+        Serializer.registerClass(SelectedPiecesMessage.class);
+        Serializer.registerClass(SelectTSKMessage.class);
 
-        Serializer.registerClass(ActivePlayer.class);
-        Serializer.registerClass(AnyPiece.class);
-        Serializer.registerClass(Briefing.class);
+        Serializer.registerClass(ActivePlayerMessage.class);
+        Serializer.registerClass(AnyPieceMessage.class);
+        Serializer.registerClass(BriefingMessage.class);
         Serializer.registerClass(CeremonyMessage.class);
-        Serializer.registerClass(Die.class);
-        Serializer.registerClass(DiceAgain.class);
-        Serializer.registerClass(DiceNow.class);
-        Serializer.registerClass(EndOfTurn.class);
-        Serializer.registerClass(LobbyAccept.class);
-        Serializer.registerClass(LobbyDeny.class);
-        Serializer.registerClass(LobbyPlayerJoin.class);
-        Serializer.registerClass(LobbyPlayerLeave.class);
+        Serializer.registerClass(DieMessage.class);
+        Serializer.registerClass(DiceAgainMessage.class);
+        Serializer.registerClass(DiceNowMessage.class);
+        Serializer.registerClass(EndOfTurnMessage.class);
+        Serializer.registerClass(LobbyAcceptMessage.class);
+        Serializer.registerClass(LobbyDenyMessage.class);
+        Serializer.registerClass(LobbyPlayerJoinMessage.class);
+        Serializer.registerClass(LobbyPlayerLeaveMessage.class);
         Serializer.registerClass(MoveMessage.class);
-        Serializer.registerClass(NoTurn.class);
-        Serializer.registerClass(PauseGame.class);
-        Serializer.registerClass(PlayCard.class);
-        Serializer.registerClass(PossibleCard.class);
-        Serializer.registerClass(PossiblePiece.class);
-        Serializer.registerClass(RankingResponse.class);
-        Serializer.registerClass(RankingRollAgain.class);
-        Serializer.registerClass(ReconnectBriefing.class);
-        Serializer.registerClass(ResumeGame.class);
-        Serializer.registerClass(ServerStartGame.class);
-        Serializer.registerClass(StartPiece.class);
-        Serializer.registerClass(UpdateReady.class);
-        Serializer.registerClass(UpdateTSK.class);
-        Serializer.registerClass(WaitPiece.class);
+        Serializer.registerClass(NoTurnMessage.class);
+        Serializer.registerClass(PauseGameMessage.class);
+        Serializer.registerClass(PlayCardMessage.class);
+        Serializer.registerClass(PossibleCardMessage.class);
+        Serializer.registerClass(PossiblePieceMessage.class);
+        Serializer.registerClass(RankingResponseMessage.class);
+        Serializer.registerClass(RankingRollAgainMessage.class);
+        Serializer.registerClass(ReconnectBriefingMessage.class);
+        Serializer.registerClass(ResumeGameMessage.class);
+        Serializer.registerClass(ServerStartGameMessage.class);
+        Serializer.registerClass(StartPieceMessage.class);
+        Serializer.registerClass(UpdateReadyMessage.class);
+        Serializer.registerClass(UpdateTSKMessage.class);
+        Serializer.registerClass(WaitPieceMessage.class);
     }
 
     private void registerListeners() {
-        myServer.addMessageListener(this, AnimationEnd.class);
-        myServer.addMessageListener(this, ClientStartGame.class);
-        myServer.addMessageListener(this, DeselectTSK.class);
-        myServer.addMessageListener(this, ForceContinueGame.class);
-        myServer.addMessageListener(this, StartGame.class);
-        myServer.addMessageListener(this, JoinServer.class);
-        myServer.addMessageListener(this, LeaveGame.class);
-        myServer.addMessageListener(this, LobbyNotReady.class);
-        myServer.addMessageListener(this, LobbyReady.class);
-        myServer.addMessageListener(this, NoPowerCard.class);
-        myServer.addMessageListener(this, RequestBriefing.class);
-        myServer.addMessageListener(this, RequestDie.class);
-        myServer.addMessageListener(this, RequestMove.class);
-        myServer.addMessageListener(this, RequestPlayCard.class);
-        myServer.addMessageListener(this, SelectCard.class);
-        myServer.addMessageListener(this, SelectedPieces.class);
-        myServer.addMessageListener(this, SelectTSK.class);
+        myServer.addMessageListener(this, AnimationEndMessage.class);
+        myServer.addMessageListener(this, ClientStartGameMessage.class);
+        myServer.addMessageListener(this, DeselectTSKMessage.class);
+        myServer.addMessageListener(this, ForceContinueGameMessage.class);
+        myServer.addMessageListener(this, StartGameMessage.class);
+        myServer.addMessageListener(this, JoinServerMessage.class);
+        myServer.addMessageListener(this, LeaveGameMessage.class);
+        myServer.addMessageListener(this, LobbyNotReadyMessage.class);
+        myServer.addMessageListener(this, LobbyReadyMessage.class);
+        myServer.addMessageListener(this, NoPowerCardMessage.class);
+        myServer.addMessageListener(this, RequestBriefingMessage.class);
+        myServer.addMessageListener(this, RequestDieMessage.class);
+        myServer.addMessageListener(this, RequestMoveMessage.class);
+        myServer.addMessageListener(this, RequestPlayCardMessage.class);
+        myServer.addMessageListener(this, SelectCardMessage.class);
+        myServer.addMessageListener(this, SelectedPiecesMessage.class);
+        myServer.addMessageListener(this, SelectTSKMessage.class);
         myServer.addConnectionListener(this);
     }
 
@@ -186,7 +186,7 @@ public void connectionRemoved(Server server, HostedConnection hostedConnection)
      * @param id as the id of the disconnected player.
      */
     public void handleDisconnect(int id) {
-        this.logic.received(new Disconnected(), id);
+        this.logic.received(new DisconnectedMessage(), id);
     }
 
     public void exit(int exitValue) { //NON-NLS