From 46c43493621550aa00b3f239db02a1a15b8c4128 Mon Sep 17 00:00:00 2001 From: betasteward Date: Thu, 25 Jun 2015 21:41:14 -0400 Subject: [PATCH] more package refactoring --- .../main/java/org/mage/network/Server.java | 42 +++++++++---------- .../ClientRegisteredMessageHandler.java | 6 +-- .../{ => callback}/ChatMessageMessage.java | 3 +- .../{ => callback}/GameAskMessage.java | 3 +- .../GameChooseAbilityMessage.java | 3 +- .../GameChooseChoiceMessage.java | 3 +- .../{ => callback}/GameChoosePileMessage.java | 3 +- .../{ => callback}/GameEndInfoMessage.java | 3 +- .../{ => callback}/GameErrorMessage.java | 3 +- .../{ => callback}/GameInformMessage.java | 3 +- .../GameInformPersonalMessage.java | 3 +- .../{ => callback}/GameInitMessage.java | 3 +- .../{ => callback}/GameOverMessage.java | 3 +- .../{ => callback}/GamePlayManaMessage.java | 3 +- .../{ => callback}/GamePlayXManaMessage.java | 3 +- .../GameSelectAmountMessage.java | 3 +- .../{ => callback}/GameSelectMessage.java | 3 +- .../{ => callback}/GameStartedMessage.java | 3 +- .../{ => callback}/GameTargetMessage.java | 3 +- .../{ => callback}/GameUpdateMessage.java | 3 +- .../{ => callback}/InformClientMessage.java | 4 +- .../{ => callback}/JoinedTableMessage.java | 3 +- .../UserRequestDialogMessage.java | 3 +- .../messages/requests/ChatRoomIdRequest.java | 4 +- .../messages/requests/CreateTableRequest.java | 4 +- .../messages/requests/GetRoomRequest.java | 4 +- .../messages/requests/JoinGameRequest.java | 4 +- .../messages/requests/JoinTableRequest.java | 4 +- .../requests/RegisterClientRequest.java | 6 +-- .../requests/ServerMessagesRequest.java | 4 +- .../messages/requests/StartMatchRequest.java | 4 +- .../messages/requests/SubmitDeckRequest.java | 4 +- .../requests/TableWaitingRequest.java | 4 +- ...IdMessage.java => ChatRoomIdResponse.java} | 4 +- ...age.java => ClientRegisteredResponse.java} | 4 +- ...gMessage.java => CreateTableResponse.java} | 4 +- ...{RoomMessage.java => GetRoomResponse.java} | 4 +- ...GameMessage.java => JoinGameResponse.java} | 4 +- ...eckMessage.java => JoinTableResponse.java} | 4 +- .../{ => responses}/LeftTableMessage.java | 0 ...ssage.java => ServerMessagesResponse.java} | 4 +- ...leMessage.java => StartMatchResponse.java} | 4 +- ...chMessage.java => SubmitDeckResponse.java} | 4 +- ...Message.java => TableWaitingResponse.java} | 4 +- 44 files changed, 108 insertions(+), 86 deletions(-) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/ChatMessageMessage.java (85%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameAskMessage.java (87%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameChooseAbilityMessage.java (86%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameChooseChoiceMessage.java (85%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameChoosePileMessage.java (88%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameEndInfoMessage.java (86%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameErrorMessage.java (84%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameInformMessage.java (86%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameInformPersonalMessage.java (86%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameInitMessage.java (85%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameOverMessage.java (84%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GamePlayManaMessage.java (87%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GamePlayXManaMessage.java (87%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameSelectAmountMessage.java (87%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameSelectMessage.java (89%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameStartedMessage.java (84%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameTargetMessage.java (92%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/GameUpdateMessage.java (85%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/InformClientMessage.java (80%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/JoinedTableMessage.java (89%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => callback}/UserRequestDialogMessage.java (87%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{ChatRoomIdMessage.java => ChatRoomIdResponse.java} (80%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{ClientRegisteredMessage.java => ClientRegisteredResponse.java} (71%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{TableWaitingMessage.java => CreateTableResponse.java} (79%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{RoomMessage.java => GetRoomResponse.java} (83%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{JoinGameMessage.java => JoinGameResponse.java} (80%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{SubmitDeckMessage.java => JoinTableResponse.java} (79%) rename Mage.Network/src/main/java/org/mage/network/messages/{ => responses}/LeftTableMessage.java (100%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{ServerMessagesMessage.java => ServerMessagesResponse.java} (78%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{JoinTableMessage.java => StartMatchResponse.java} (79%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{StartMatchMessage.java => SubmitDeckResponse.java} (79%) rename Mage.Network/src/main/java/org/mage/network/messages/responses/{CreateTableMessage.java => TableWaitingResponse.java} (79%) diff --git a/Mage.Network/src/main/java/org/mage/network/Server.java b/Mage.Network/src/main/java/org/mage/network/Server.java index eb135347ade..fcc45829095 100644 --- a/Mage.Network/src/main/java/org/mage/network/Server.java +++ b/Mage.Network/src/main/java/org/mage/network/Server.java @@ -40,29 +40,29 @@ import org.mage.network.handlers.server.ConnectionHandler; import org.mage.network.handlers.server.HeartbeatHandler; import org.mage.network.handlers.server.ServerRequestHandler; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.ChatMessageMessage; -import org.mage.network.messages.GameAskMessage; -import org.mage.network.messages.GameChooseAbilityMessage; -import org.mage.network.messages.GameChooseChoiceMessage; -import org.mage.network.messages.GameChoosePileMessage; -import org.mage.network.messages.GameEndInfoMessage; -import org.mage.network.messages.GameErrorMessage; -import org.mage.network.messages.GameInformMessage; -import org.mage.network.messages.GameInformPersonalMessage; -import org.mage.network.messages.GameInitMessage; -import org.mage.network.messages.GameOverMessage; -import org.mage.network.messages.GamePlayManaMessage; -import org.mage.network.messages.GamePlayXManaMessage; -import org.mage.network.messages.GameSelectAmountMessage; -import org.mage.network.messages.GameSelectMessage; -import org.mage.network.messages.GameStartedMessage; -import org.mage.network.messages.GameTargetMessage; -import org.mage.network.messages.GameUpdateMessage; -import org.mage.network.messages.InformClientMessage; -import org.mage.network.messages.JoinedTableMessage; +import org.mage.network.messages.callback.ChatMessageMessage; +import org.mage.network.messages.callback.GameAskMessage; +import org.mage.network.messages.callback.GameChooseAbilityMessage; +import org.mage.network.messages.callback.GameChooseChoiceMessage; +import org.mage.network.messages.callback.GameChoosePileMessage; +import org.mage.network.messages.callback.GameEndInfoMessage; +import org.mage.network.messages.callback.GameErrorMessage; +import org.mage.network.messages.callback.GameInformMessage; +import org.mage.network.messages.callback.GameInformPersonalMessage; +import org.mage.network.messages.callback.GameInitMessage; +import org.mage.network.messages.callback.GameOverMessage; +import org.mage.network.messages.callback.GamePlayManaMessage; +import org.mage.network.messages.callback.GamePlayXManaMessage; +import org.mage.network.messages.callback.GameSelectAmountMessage; +import org.mage.network.messages.callback.GameSelectMessage; +import org.mage.network.messages.callback.GameStartedMessage; +import org.mage.network.messages.callback.GameTargetMessage; +import org.mage.network.messages.callback.GameUpdateMessage; +import org.mage.network.messages.callback.InformClientMessage; +import org.mage.network.messages.callback.JoinedTableMessage; import org.mage.network.messages.MessageType; import org.mage.network.messages.PingMessage; -import org.mage.network.messages.UserRequestDialogMessage; +import org.mage.network.messages.callback.UserRequestDialogMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientRegisteredMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientRegisteredMessageHandler.java index 92e29c31a75..553578ebbb9 100644 --- a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientRegisteredMessageHandler.java +++ b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientRegisteredMessageHandler.java @@ -10,14 +10,14 @@ import mage.interfaces.ServerState; import mage.remote.Connection; import mage.utils.MageVersion; import org.apache.log4j.Logger; -import org.mage.network.messages.responses.ClientRegisteredMessage; +import org.mage.network.messages.responses.ClientRegisteredResponse; import org.mage.network.messages.requests.RegisterClientRequest; /** * * @author BetaSteward */ -public class ClientRegisteredMessageHandler extends SimpleChannelInboundHandler { +public class ClientRegisteredMessageHandler extends SimpleChannelInboundHandler { private static final Logger logger = Logger.getLogger(ClientRegisteredMessageHandler.class); @@ -32,7 +32,7 @@ public class ClientRegisteredMessageHandler extends SimpleChannelInboundHandler< } @Override - protected void messageReceived(ChannelHandlerContext ctx, ClientRegisteredMessage msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, ClientRegisteredResponse msg) throws Exception { queue.offer(msg.getServerState()); } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/ChatMessageMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/ChatMessageMessage.java similarity index 85% rename from Mage.Network/src/main/java/org/mage/network/messages/ChatMessageMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/ChatMessageMessage.java index 11dc244859d..79e466774db 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/ChatMessageMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/ChatMessageMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.ChatMessage; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameAskMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameAskMessage.java similarity index 87% rename from Mage.Network/src/main/java/org/mage/network/messages/GameAskMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameAskMessage.java index afbe2a1c5bb..ebf8072f45f 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameAskMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameAskMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.GameView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameChooseAbilityMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseAbilityMessage.java similarity index 86% rename from Mage.Network/src/main/java/org/mage/network/messages/GameChooseAbilityMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseAbilityMessage.java index c6cf75174c6..b6a32b4f851 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameChooseAbilityMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseAbilityMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.AbilityPickerView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameChooseChoiceMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseChoiceMessage.java similarity index 85% rename from Mage.Network/src/main/java/org/mage/network/messages/GameChooseChoiceMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseChoiceMessage.java index 012291d6281..3eb24b21f14 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameChooseChoiceMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseChoiceMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.choices.Choice; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameChoosePileMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameChoosePileMessage.java similarity index 88% rename from Mage.Network/src/main/java/org/mage/network/messages/GameChoosePileMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameChoosePileMessage.java index 343cb7932b5..8311484ae9c 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameChoosePileMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameChoosePileMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.CardsView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameEndInfoMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameEndInfoMessage.java similarity index 86% rename from Mage.Network/src/main/java/org/mage/network/messages/GameEndInfoMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameEndInfoMessage.java index e3ea9c7861f..79f3a1578e1 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameEndInfoMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameEndInfoMessage.java @@ -1,9 +1,10 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.game.Table; import mage.view.GameEndView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameErrorMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameErrorMessage.java similarity index 84% rename from Mage.Network/src/main/java/org/mage/network/messages/GameErrorMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameErrorMessage.java index cc2fec517d1..bf8a60dc268 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameErrorMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameErrorMessage.java @@ -1,7 +1,8 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameInformMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformMessage.java similarity index 86% rename from Mage.Network/src/main/java/org/mage/network/messages/GameInformMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformMessage.java index f6ca55ab9f1..e9fa7fdfd0b 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameInformMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.GameClientMessage; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameInformPersonalMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformPersonalMessage.java similarity index 86% rename from Mage.Network/src/main/java/org/mage/network/messages/GameInformPersonalMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformPersonalMessage.java index 51734a71810..21c5eadca8b 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameInformPersonalMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformPersonalMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.GameClientMessage; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameInitMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameInitMessage.java similarity index 85% rename from Mage.Network/src/main/java/org/mage/network/messages/GameInitMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameInitMessage.java index 9429baa3ffd..eb4cc982562 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameInitMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameInitMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.GameView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameOverMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameOverMessage.java similarity index 84% rename from Mage.Network/src/main/java/org/mage/network/messages/GameOverMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameOverMessage.java index f9e747b5f75..9b734d0d74b 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameOverMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameOverMessage.java @@ -1,7 +1,8 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GamePlayManaMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayManaMessage.java similarity index 87% rename from Mage.Network/src/main/java/org/mage/network/messages/GamePlayManaMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayManaMessage.java index 5f680a7af63..d6c26caf79a 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GamePlayManaMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayManaMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.GameView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GamePlayXManaMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayXManaMessage.java similarity index 87% rename from Mage.Network/src/main/java/org/mage/network/messages/GamePlayXManaMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayXManaMessage.java index f03e1749238..1bfed80090e 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GamePlayXManaMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayXManaMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.GameView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameSelectAmountMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectAmountMessage.java similarity index 87% rename from Mage.Network/src/main/java/org/mage/network/messages/GameSelectAmountMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectAmountMessage.java index 6d0ac4d3ea7..db4cc76ab8e 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameSelectAmountMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectAmountMessage.java @@ -1,7 +1,8 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameSelectMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectMessage.java similarity index 89% rename from Mage.Network/src/main/java/org/mage/network/messages/GameSelectMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectMessage.java index 1c4d65061f4..aa4afe68ce2 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameSelectMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectMessage.java @@ -1,10 +1,11 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.io.Serializable; import java.util.Map; import java.util.UUID; import mage.view.GameView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameStartedMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameStartedMessage.java similarity index 84% rename from Mage.Network/src/main/java/org/mage/network/messages/GameStartedMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameStartedMessage.java index bc3d45444cd..f409f8cf173 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameStartedMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameStartedMessage.java @@ -1,7 +1,8 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameTargetMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameTargetMessage.java similarity index 92% rename from Mage.Network/src/main/java/org/mage/network/messages/GameTargetMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameTargetMessage.java index bde42773915..58ee15fb97b 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameTargetMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameTargetMessage.java @@ -1,4 +1,4 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.io.Serializable; import java.util.Map; @@ -7,6 +7,7 @@ import java.util.UUID; import mage.view.CardsView; import mage.view.GameView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/GameUpdateMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameUpdateMessage.java similarity index 85% rename from Mage.Network/src/main/java/org/mage/network/messages/GameUpdateMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/GameUpdateMessage.java index d2a2493901b..aeef3b415b0 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/GameUpdateMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/GameUpdateMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.GameView; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/InformClientMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/InformClientMessage.java similarity index 80% rename from Mage.Network/src/main/java/org/mage/network/messages/InformClientMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/InformClientMessage.java index 0d47eb13f6a..fb98ba7f826 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/InformClientMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/InformClientMessage.java @@ -1,6 +1,8 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; +import org.mage.network.messages.MessageType; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/JoinedTableMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/JoinedTableMessage.java similarity index 89% rename from Mage.Network/src/main/java/org/mage/network/messages/JoinedTableMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/JoinedTableMessage.java index 51ef04440ca..bf7bf115502 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/JoinedTableMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/JoinedTableMessage.java @@ -1,7 +1,8 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/UserRequestDialogMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/UserRequestDialogMessage.java similarity index 87% rename from Mage.Network/src/main/java/org/mage/network/messages/UserRequestDialogMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/callback/UserRequestDialogMessage.java index 9ebc83c47ed..b2f28fef41f 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/UserRequestDialogMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/UserRequestDialogMessage.java @@ -1,8 +1,9 @@ -package org.mage.network.messages; +package org.mage.network.messages.callback; import java.util.UUID; import mage.view.UserRequestMessage; import org.mage.network.handlers.client.ClientMessageHandler; +import org.mage.network.messages.ClientMessage; /** * diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/ChatRoomIdRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/ChatRoomIdRequest.java index fdb3370acd4..26adc7f49a4 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/ChatRoomIdRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/ChatRoomIdRequest.java @@ -4,7 +4,7 @@ import io.netty.channel.ChannelHandlerContext; import java.util.UUID; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.ChatRoomIdMessage; +import org.mage.network.messages.responses.ChatRoomIdResponse; /** * @@ -20,7 +20,7 @@ public class ChatRoomIdRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new ChatRoomIdMessage(server.getRoomChatId(roomId))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new ChatRoomIdResponse(server.getRoomChatId(roomId))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/CreateTableRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/CreateTableRequest.java index b51f492eb86..f624dd7dd1f 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/CreateTableRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/CreateTableRequest.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.game.match.MatchOptions; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.CreateTableMessage; +import org.mage.network.messages.responses.CreateTableResponse; /** * @@ -23,7 +23,7 @@ public class CreateTableRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new CreateTableMessage(server.createTable(ctx.channel().id().asLongText(), roomId, options))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new CreateTableResponse(server.createTable(ctx.channel().id().asLongText(), roomId, options))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/GetRoomRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/GetRoomRequest.java index 7f3eab18cc2..3d2eb763beb 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/GetRoomRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/GetRoomRequest.java @@ -4,7 +4,7 @@ import io.netty.channel.ChannelHandlerContext; import java.util.UUID; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.RoomMessage; +import org.mage.network.messages.responses.GetRoomResponse; /** * @@ -20,7 +20,7 @@ public class GetRoomRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new RoomMessage(server.getRoom(roomId))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new GetRoomResponse(server.getRoom(roomId))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinGameRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinGameRequest.java index 2903789fc58..2e4a455d103 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinGameRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinGameRequest.java @@ -4,7 +4,7 @@ import io.netty.channel.ChannelHandlerContext; import java.util.UUID; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.JoinGameMessage; +import org.mage.network.messages.responses.JoinGameResponse; /** * @@ -20,7 +20,7 @@ public class JoinGameRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new JoinGameMessage(server.joinGame(gameId, ctx.channel().id().asLongText()))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new JoinGameResponse(server.joinGame(gameId, ctx.channel().id().asLongText()))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinTableRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinTableRequest.java index 8c98c35e005..948cc7d4049 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinTableRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinTableRequest.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.cards.decks.DeckCardLists; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.JoinTableMessage; +import org.mage.network.messages.responses.JoinTableResponse; /** * @@ -33,7 +33,7 @@ public class JoinTableRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new JoinTableMessage(server.joinTable(ctx.channel().id().asLongText(), roomId, tableId, name, playerType, skill, deckList, password))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new JoinTableResponse(server.joinTable(ctx.channel().id().asLongText(), roomId, tableId, name, playerType, skill, deckList, password))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/RegisterClientRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/RegisterClientRequest.java index 6c83c98c32d..04f36fa117e 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/RegisterClientRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/RegisterClientRequest.java @@ -8,7 +8,7 @@ import mage.remote.DisconnectReason; import mage.utils.MageVersion; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.ClientRegisteredMessage; +import org.mage.network.messages.responses.ClientRegisteredResponse; /** * @@ -28,10 +28,10 @@ public class RegisterClientRequest extends ServerRequest { String host = ((InetSocketAddress)ctx.channel().remoteAddress()).getAddress().getHostAddress(); boolean result = server.registerClient(connection, ctx.channel().id().asLongText(), version, host); if (result) { - ctx.writeAndFlush(new ClientRegisteredMessage(server.getServerState())).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new ClientRegisteredResponse(server.getServerState())).addListener(WriteListener.getInstance()); } else { - ctx.writeAndFlush(new ClientRegisteredMessage(new ServerState())).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new ClientRegisteredResponse(new ServerState())).addListener(WriteListener.getInstance()); server.disconnect(ctx.channel().id().asLongText(), DisconnectReason.ValidationError); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/ServerMessagesRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/ServerMessagesRequest.java index 82f6c48c026..e277d57dead 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/ServerMessagesRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/ServerMessagesRequest.java @@ -3,7 +3,7 @@ package org.mage.network.messages.requests; import io.netty.channel.ChannelHandlerContext; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.ServerMessagesMessage; +import org.mage.network.messages.responses.ServerMessagesResponse; /** * @@ -13,7 +13,7 @@ public class ServerMessagesRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new ServerMessagesMessage(server.getServerMessages())).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new ServerMessagesResponse(server.getServerMessages())).addListener(WriteListener.getInstance()); } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/StartMatchRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/StartMatchRequest.java index 9630d64b9c5..4484a0fbb0c 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/StartMatchRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/StartMatchRequest.java @@ -4,7 +4,7 @@ import io.netty.channel.ChannelHandlerContext; import java.util.UUID; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.StartMatchMessage; +import org.mage.network.messages.responses.StartMatchResponse; /** * @@ -22,7 +22,7 @@ public class StartMatchRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new StartMatchMessage(server.startMatch(ctx.channel().id().asLongText(), roomId, tableId))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new StartMatchResponse(server.startMatch(ctx.channel().id().asLongText(), roomId, tableId))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/SubmitDeckRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/SubmitDeckRequest.java index 29f74c9e4e0..66adcdae777 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/SubmitDeckRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/SubmitDeckRequest.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.cards.decks.DeckCardLists; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.SubmitDeckMessage; +import org.mage.network.messages.responses.SubmitDeckResponse; /** * @@ -22,7 +22,7 @@ public class SubmitDeckRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new SubmitDeckMessage(server.submitDeck(ctx.channel().id().asLongText(), tableId, deckCardLists))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new SubmitDeckResponse(server.submitDeck(ctx.channel().id().asLongText(), tableId, deckCardLists))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/TableWaitingRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/TableWaitingRequest.java index 0fa2bfc0f25..24cc7e83bc2 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/requests/TableWaitingRequest.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/TableWaitingRequest.java @@ -4,7 +4,7 @@ import io.netty.channel.ChannelHandlerContext; import java.util.UUID; import org.mage.network.handlers.WriteListener; import org.mage.network.interfaces.MageServer; -import org.mage.network.messages.responses.TableWaitingMessage; +import org.mage.network.messages.responses.TableWaitingResponse; /** * @@ -22,7 +22,7 @@ public class TableWaitingRequest extends ServerRequest { @Override public void handleMessage(MageServer server, ChannelHandlerContext ctx) { - ctx.writeAndFlush(new TableWaitingMessage(server.getTable(roomId, tableId))).addListener(WriteListener.getInstance()); + ctx.writeAndFlush(new TableWaitingResponse(server.getTable(roomId, tableId))).addListener(WriteListener.getInstance()); } } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdResponse.java similarity index 80% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdResponse.java index 75e2a7d7eed..c205c69a51b 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdResponse.java @@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class ChatRoomIdMessage extends ClientMessage { +public class ChatRoomIdResponse extends ClientMessage { private UUID chatId; - public ChatRoomIdMessage(UUID chatId) { + public ChatRoomIdResponse(UUID chatId) { this.chatId = chatId; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/ClientRegisteredMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/ClientRegisteredResponse.java similarity index 71% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/ClientRegisteredMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/ClientRegisteredResponse.java index db70b7f589c..4a8bbf4b782 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/ClientRegisteredMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/ClientRegisteredResponse.java @@ -7,11 +7,11 @@ import mage.interfaces.ServerState; * * @author BetaSteward */ -public class ClientRegisteredMessage implements Serializable { +public class ClientRegisteredResponse implements Serializable { private ServerState state; - public ClientRegisteredMessage(ServerState state) { + public ClientRegisteredResponse(ServerState state) { this.state = state; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableResponse.java similarity index 79% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableResponse.java index 21bab318dc5..623cffe5ac4 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableResponse.java @@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class TableWaitingMessage extends ClientMessage { +public class CreateTableResponse extends ClientMessage { private TableView table; - public TableWaitingMessage(TableView table) { + public CreateTableResponse(TableView table) { this.table = table; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/RoomMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/GetRoomResponse.java similarity index 83% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/RoomMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/GetRoomResponse.java index 7bb150a1bb6..ea18e495597 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/RoomMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/GetRoomResponse.java @@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class RoomMessage extends ClientMessage { +public class GetRoomResponse extends ClientMessage { private RoomView room; - public RoomMessage(RoomView room) { + public GetRoomResponse(RoomView room) { this.room = room; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameResponse.java similarity index 80% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameResponse.java index 5f81155e9bf..d83b6e5f59e 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameResponse.java @@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class JoinGameMessage extends ClientMessage { +public class JoinGameResponse extends ClientMessage { private UUID chatId; - public JoinGameMessage(UUID chatId) { + public JoinGameResponse(UUID chatId) { this.chatId = chatId; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableResponse.java similarity index 79% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableResponse.java index 075e952f779..f722ee4cb25 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableResponse.java @@ -7,11 +7,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class SubmitDeckMessage extends ClientMessage { +public class JoinTableResponse extends ClientMessage { private boolean success; - public SubmitDeckMessage(boolean success) { + public JoinTableResponse(boolean success) { this.success = success; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/LeftTableMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/LeftTableMessage.java similarity index 100% rename from Mage.Network/src/main/java/org/mage/network/messages/LeftTableMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/LeftTableMessage.java diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/ServerMessagesMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/ServerMessagesResponse.java similarity index 78% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/ServerMessagesMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/ServerMessagesResponse.java index c9cf8221a88..41819d52df9 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/ServerMessagesMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/ServerMessagesResponse.java @@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class ServerMessagesMessage extends ClientMessage { +public class ServerMessagesResponse extends ClientMessage { private List messages; - public ServerMessagesMessage(List messages) { + public ServerMessagesResponse(List messages) { this.messages = messages; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchResponse.java similarity index 79% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchResponse.java index 99dea7c05b0..b5d0ca3419d 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchResponse.java @@ -7,11 +7,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class JoinTableMessage extends ClientMessage { +public class StartMatchResponse extends ClientMessage { private boolean success; - public JoinTableMessage(boolean success) { + public StartMatchResponse(boolean success) { this.success = success; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckResponse.java similarity index 79% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckResponse.java index a6bd893e5ad..fbd9aa700c6 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckResponse.java @@ -7,11 +7,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class StartMatchMessage extends ClientMessage { +public class SubmitDeckResponse extends ClientMessage { private boolean success; - public StartMatchMessage(boolean success) { + public SubmitDeckResponse(boolean success) { this.success = success; } diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableMessage.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingResponse.java similarity index 79% rename from Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableMessage.java rename to Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingResponse.java index 60578aa7f68..320089742ed 100644 --- a/Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableMessage.java +++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingResponse.java @@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage; * * @author BetaSteward */ -public class CreateTableMessage extends ClientMessage { +public class TableWaitingResponse extends ClientMessage { private TableView table; - public CreateTableMessage(TableView table) { + public TableWaitingResponse(TableView table) { this.table = table; }