more package refactoring

This commit is contained in:
betasteward 2015-06-25 21:41:14 -04:00
parent 72a301d604
commit 46c4349362
44 changed files with 108 additions and 86 deletions

View file

@ -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;
/**
*

View file

@ -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<ClientRegisteredMessage> {
public class ClientRegisteredMessageHandler extends SimpleChannelInboundHandler<ClientRegisteredResponse> {
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());
}

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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;
/**
*

View file

@ -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());
}
}

View file

@ -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());
}
}

View file

@ -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());
}
}

View file

@ -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());
}
}

View file

@ -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());
}
}

View file

@ -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);
}
}

View file

@ -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());
}

View file

@ -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());
}
}

View file

@ -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());
}
}

View file

@ -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());
}
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class ServerMessagesMessage extends ClientMessage {
public class ServerMessagesResponse extends ClientMessage {
private List<String> messages;
public ServerMessagesMessage(List<String> messages) {
public ServerMessagesResponse(List<String> messages) {
this.messages = messages;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}