From cfd16973f562cbc5e1b7f4804d80098fd8782336 Mon Sep 17 00:00:00 2001 From: Benjamin Feyer Date: Mon, 2 Dec 2024 16:59:50 +0100 Subject: [PATCH] refactored the package names --- .../ClientStateTest.java | 3 +-- .../{Dialog => dialog}/LobbyStateTest.java | 2 +- .../NetworkDialogClientTest.java | 2 +- .../NetworkDialogHostTest.java | 2 +- .../{Dialog => dialog}/StartDialogTest.java | 2 +- .../ServerStateTest.java | 16 ++++++++-------- 6 files changed, 13 insertions(+), 14 deletions(-) rename Projekte/mdga/model/src/test/java/pp/mdga/client/{clientState => clientstate}/ClientStateTest.java (99%) rename Projekte/mdga/model/src/test/java/pp/mdga/client/{Dialog => dialog}/LobbyStateTest.java (98%) rename Projekte/mdga/model/src/test/java/pp/mdga/client/{Dialog => dialog}/NetworkDialogClientTest.java (97%) rename Projekte/mdga/model/src/test/java/pp/mdga/client/{Dialog => dialog}/NetworkDialogHostTest.java (96%) rename Projekte/mdga/model/src/test/java/pp/mdga/client/{Dialog => dialog}/StartDialogTest.java (96%) rename Projekte/mdga/model/src/test/java/pp/mdga/server/{serverState => serverstate}/ServerStateTest.java (98%) diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientstate/ClientStateTest.java similarity index 99% rename from Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java rename to Projekte/mdga/model/src/test/java/pp/mdga/client/clientstate/ClientStateTest.java index b973fe54..0cec7eef 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientstate/ClientStateTest.java @@ -1,4 +1,4 @@ -package pp.mdga.client.clientState; +package pp.mdga.client.clientstate; import org.junit.*; import pp.mdga.client.*; @@ -19,7 +19,6 @@ import pp.mdga.message.client.ClientMessage; import java.util.ArrayList; -import java.util.UUID; import static org.junit.Assert.*; diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/LobbyStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/LobbyStateTest.java similarity index 98% rename from Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/LobbyStateTest.java rename to Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/LobbyStateTest.java index c8c2344f..2169276d 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/LobbyStateTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/LobbyStateTest.java @@ -1,4 +1,4 @@ -package pp.mdga.client.Dialog; +package pp.mdga.client.dialog; import org.junit.Before; import org.junit.Test; diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/NetworkDialogClientTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/NetworkDialogClientTest.java similarity index 97% rename from Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/NetworkDialogClientTest.java rename to Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/NetworkDialogClientTest.java index 53e42e3c..b58e17b7 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/NetworkDialogClientTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/NetworkDialogClientTest.java @@ -1,4 +1,4 @@ -package pp.mdga.client.Dialog; +package pp.mdga.client.dialog; import org.junit.Before; import org.junit.Test; diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/NetworkDialogHostTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/NetworkDialogHostTest.java similarity index 96% rename from Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/NetworkDialogHostTest.java rename to Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/NetworkDialogHostTest.java index 71b7198d..8597b9eb 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/NetworkDialogHostTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/NetworkDialogHostTest.java @@ -1,4 +1,4 @@ -package pp.mdga.client.Dialog; +package pp.mdga.client.dialog; import org.junit.Before; import org.junit.Test; diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/StartDialogTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/StartDialogTest.java similarity index 96% rename from Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/StartDialogTest.java rename to Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/StartDialogTest.java index f1d88ac3..09ca1632 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/client/Dialog/StartDialogTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/dialog/StartDialogTest.java @@ -1,4 +1,4 @@ -package pp.mdga.client.Dialog; +package pp.mdga.client.dialog; import org.junit.Before; import org.junit.Test; diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/server/serverstate/ServerStateTest.java similarity index 98% rename from Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java rename to Projekte/mdga/model/src/test/java/pp/mdga/server/serverstate/ServerStateTest.java index fedbcb3d..e3a3be43 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/server/serverstate/ServerStateTest.java @@ -1,4 +1,4 @@ -package pp.mdga.server.serverState; +package pp.mdga.server.serverstate; import org.junit.*; import pp.mdga.game.*; @@ -155,14 +155,14 @@ public void disconnectClient(int id) { //initialize the powerCard bonusCardClient = BonusCard.SHIELD; - lobbyState = (LobbyState) serverGameLogic.getLobbyState(); - gameState = (GameState) serverGameLogic.getGameState(); - ceremonyState = (CeremonyState) serverGameLogic.getCeremonyState(); - interruptState = (InterruptState) serverGameLogic.getInterruptState(); + lobbyState = serverGameLogic.getLobbyState(); + gameState = serverGameLogic.getGameState(); + ceremonyState = serverGameLogic.getCeremonyState(); + interruptState = serverGameLogic.getInterruptState(); - determineStartPlayerState = (DetermineStartPlayerState) gameState.getDetermineStartPlayerState(); - turnState = (TurnState) gameState.getTurnState(); - animationState = (AnimationState) gameState.getAnimationState(); + determineStartPlayerState = gameState.getDetermineStartPlayerState(); + turnState = gameState.getTurnState(); + animationState = gameState.getAnimationState(); animationEnd = new AnimationEndMessage();