From a316b01b15e065eee03ca8b9a94035bc6a140fc2 Mon Sep 17 00:00:00 2001
From: betasteward <betasteward@gmail.com>
Date: Wed, 1 Jul 2015 22:53:22 -0400
Subject: [PATCH] added JoinTournamentTable + more refactoring

---
 .../main/java/org/mage/network/Client.java    |  9 ++++-
 .../handlers/client/ClientMessageHandler.java |  7 ++++
 .../mage/network/interfaces/MageServer.java   |  3 +-
 .../messages/requests/ChatRoomIdRequest.java  |  4 +-
 .../messages/requests/CreateTableRequest.java |  4 +-
 .../messages/requests/JoinGameRequest.java    |  4 +-
 .../messages/requests/JoinTableRequest.java   |  4 +-
 .../requests/JoinTournamentTableRequest.java  | 38 +++++++++++++++++++
 .../messages/requests/LeaveTableRequest.java  |  4 +-
 .../messages/requests/StartMatchRequest.java  |  4 +-
 .../messages/requests/SubmitDeckRequest.java  |  4 +-
 .../requests/TableWaitingRequest.java         |  4 +-
 ...ableResponse.java => BooleanResponse.java} |  4 +-
 .../responses/ChatRoomIdResponse.java         | 24 ------------
 .../responses/LeaveTableResponse.java         | 23 -----------
 .../responses/StartMatchResponse.java         | 23 -----------
 .../responses/SubmitDeckResponse.java         | 23 -----------
 ...leResponse.java => TableViewResponse.java} | 10 ++---
 .../responses/TableWaitingResponse.java       | 24 ------------
 ...oinGameResponse.java => UUIDResponse.java} | 10 ++---
 .../src/main/java/mage/server/ServerMain.java | 37 ++++++++----------
 21 files changed, 98 insertions(+), 169 deletions(-)
 create mode 100644 Mage.Network/src/main/java/org/mage/network/messages/requests/JoinTournamentTableRequest.java
 rename Mage.Network/src/main/java/org/mage/network/messages/responses/{JoinTableResponse.java => BooleanResponse.java} (79%)
 delete mode 100644 Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdResponse.java
 delete mode 100644 Mage.Network/src/main/java/org/mage/network/messages/responses/LeaveTableResponse.java
 delete mode 100644 Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchResponse.java
 delete mode 100644 Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckResponse.java
 rename Mage.Network/src/main/java/org/mage/network/messages/responses/{CreateTableResponse.java => TableViewResponse.java} (61%)
 delete mode 100644 Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingResponse.java
 rename Mage.Network/src/main/java/org/mage/network/messages/responses/{JoinGameResponse.java => UUIDResponse.java} (62%)

diff --git a/Mage.Network/src/main/java/org/mage/network/Client.java b/Mage.Network/src/main/java/org/mage/network/Client.java
index 09d1ac95be7..0e4673077eb 100644
--- a/Mage.Network/src/main/java/org/mage/network/Client.java
+++ b/Mage.Network/src/main/java/org/mage/network/Client.java
@@ -221,8 +221,13 @@ public class Client {
         return false;
     }
 
-    public boolean joinTournamentTable(UUID roomId, UUID tableId, String playerName, String human, int i, DeckCardLists importDeck, String text) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    public boolean joinTournamentTable(UUID roomId, UUID tableId, String playerName, String playerType, int skill, DeckCardLists deck, String password) {
+        try {
+            return clientMessageHandler.joinTournamentTable(roomId, tableId, playerName, playerType, skill, deck, password);
+        } catch (Exception ex) {
+            logger.error("Error joining tournament table", ex);
+        }
+        return false;
     }
 
     public boolean joinTable(UUID roomId, UUID tableId, String playerName, String playerType, int skill, DeckCardLists deck, String password) {
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
index 1c8f36f99be..11a0ee049f3 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
@@ -1,5 +1,6 @@
 package org.mage.network.handlers.client;
 
+import org.mage.network.messages.requests.JoinTournamentTableRequest;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import java.io.Serializable;
@@ -107,6 +108,12 @@ public class ClientMessageHandler extends SimpleChannelInboundHandler<ClientMess
         return booleanQueue.take();
     }
     
+    public boolean joinTournamentTable(UUID roomId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList, String password) throws Exception {
+        booleanQueue.clear();
+        ctx.writeAndFlush(new JoinTournamentTableRequest(roomId, tableId, name, playerType, skill, deckList, password)).addListener(WriteListener.getInstance());
+        return booleanQueue.take();
+    }
+
     public boolean leaveTable(UUID roomId, UUID tableId) throws Exception {
         booleanQueue.clear();
         ctx.writeAndFlush(new LeaveTableRequest(roomId, tableId)).addListener(WriteListener.getInstance());
diff --git a/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java b/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
index d9031c38ba2..dc6d0ee0c1f 100644
--- a/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
+++ b/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
@@ -42,7 +42,8 @@ public interface MageServer {
     boolean leaveTable(String sessionId, UUID roomId, UUID tableId);
     void removeTable(String sessionId, UUID roomId, UUID tableId);
     void swapSeats(String sessionId, UUID roomId, UUID tableId, int seatNum1, int seatNum2);
-
+    boolean joinTournamentTable(String sessionId, UUID roomId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList, String password);
+        
     boolean startMatch(String sessionId, UUID roomId, UUID tableId);
     UUID joinGame(UUID gameId, String sessionId);
     void sendPlayerUUID(UUID gameId, String sessionId, UUID data);
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 26adc7f49a4..d692429ff4d 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.ChatRoomIdResponse;
+import org.mage.network.messages.responses.UUIDResponse;
 
 /**
  *
@@ -20,7 +20,7 @@ public class ChatRoomIdRequest extends ServerRequest {
 
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new ChatRoomIdResponse(server.getRoomChatId(roomId))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new UUIDResponse(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 f624dd7dd1f..883c35c721e 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.CreateTableResponse;
+import org.mage.network.messages.responses.TableViewResponse;
 
 /**
  *
@@ -23,7 +23,7 @@ public class CreateTableRequest extends ServerRequest {
     
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new CreateTableResponse(server.createTable(ctx.channel().id().asLongText(), roomId, options))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new TableViewResponse(server.createTable(ctx.channel().id().asLongText(), roomId, options))).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 2e4a455d103..dcc53114324 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.JoinGameResponse;
+import org.mage.network.messages.responses.UUIDResponse;
 
 /**
  *
@@ -20,7 +20,7 @@ public class JoinGameRequest extends ServerRequest {
 
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new JoinGameResponse(server.joinGame(gameId, ctx.channel().id().asLongText()))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new UUIDResponse(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 948cc7d4049..ca64d88197b 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.JoinTableResponse;
+import org.mage.network.messages.responses.BooleanResponse;
 
 /**
  *
@@ -33,7 +33,7 @@ public class JoinTableRequest extends ServerRequest {
 
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new JoinTableResponse(server.joinTable(ctx.channel().id().asLongText(), roomId, tableId, name, playerType, skill, deckList, password))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new BooleanResponse(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/JoinTournamentTableRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinTournamentTableRequest.java
new file mode 100644
index 00000000000..797dd67db34
--- /dev/null
+++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/JoinTournamentTableRequest.java
@@ -0,0 +1,38 @@
+package org.mage.network.messages.requests;
+
+import io.netty.channel.ChannelHandlerContext;
+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.BooleanResponse;
+
+/**
+ *
+ * @author BetaSteward
+ */
+public class JoinTournamentTableRequest extends ServerRequest {
+    private final UUID roomId;
+    private final UUID tableId;
+    private final String name;
+    private final String playerType;
+    private final int skill;
+    private final DeckCardLists deckList;
+    private final String password;
+
+    public JoinTournamentTableRequest(UUID roomId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList, String password) {
+        this.roomId = roomId;
+        this.tableId = tableId;
+        this.name = name;
+        this.playerType = playerType;
+        this.skill = skill;
+        this.deckList = deckList;
+        this.password = password;
+    }
+
+    @Override
+    public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
+        ctx.writeAndFlush(new BooleanResponse(server.joinTournamentTable(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/LeaveTableRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/LeaveTableRequest.java
index 905ec95c91d..4c501961e8f 100644
--- a/Mage.Network/src/main/java/org/mage/network/messages/requests/LeaveTableRequest.java
+++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/LeaveTableRequest.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.LeaveTableResponse;
+import org.mage.network.messages.responses.BooleanResponse;
 
 /**
  *
@@ -22,7 +22,7 @@ public class LeaveTableRequest extends ServerRequest {
 
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new LeaveTableResponse(server.leaveTable(ctx.channel().id().asLongText(), roomId, tableId))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new BooleanResponse(server.leaveTable(ctx.channel().id().asLongText(), roomId, tableId))).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 4484a0fbb0c..9953898ac9b 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.StartMatchResponse;
+import org.mage.network.messages.responses.BooleanResponse;
 
 /**
  *
@@ -22,7 +22,7 @@ public class StartMatchRequest extends ServerRequest {
 
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new StartMatchResponse(server.startMatch(ctx.channel().id().asLongText(), roomId, tableId))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new BooleanResponse(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 66adcdae777..664cd8803da 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.SubmitDeckResponse;
+import org.mage.network.messages.responses.BooleanResponse;
 
 /**
  *
@@ -22,7 +22,7 @@ public class SubmitDeckRequest extends ServerRequest {
 
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new SubmitDeckResponse(server.submitDeck(ctx.channel().id().asLongText(), tableId, deckCardLists))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new BooleanResponse(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 24cc7e83bc2..08702661c5c 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.TableWaitingResponse;
+import org.mage.network.messages.responses.TableViewResponse;
 
 /**
  *
@@ -22,7 +22,7 @@ public class TableWaitingRequest extends ServerRequest {
 
     @Override
     public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
-        ctx.writeAndFlush(new TableWaitingResponse(server.getTable(roomId, tableId))).addListener(WriteListener.getInstance());
+        ctx.writeAndFlush(new TableViewResponse(server.getTable(roomId, tableId))).addListener(WriteListener.getInstance());
     }
     
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/BooleanResponse.java
similarity index 79%
rename from Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableResponse.java
rename to Mage.Network/src/main/java/org/mage/network/messages/responses/BooleanResponse.java
index f722ee4cb25..de2056168bc 100644
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinTableResponse.java
+++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/BooleanResponse.java
@@ -7,11 +7,11 @@ import org.mage.network.messages.ClientMessage;
  *
  * @author BetaSteward
  */
-public class JoinTableResponse extends ClientMessage {
+public class BooleanResponse extends ClientMessage {
     
     private boolean success;
     
-    public JoinTableResponse(boolean success) {
+    public BooleanResponse(boolean success) {
         this.success = success;
     }
     
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdResponse.java
deleted file mode 100644
index c205c69a51b..00000000000
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/ChatRoomIdResponse.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.mage.network.messages.responses;
-
-import java.util.UUID;
-import org.mage.network.handlers.client.ClientMessageHandler;
-import org.mage.network.messages.ClientMessage;
-
-/**
- *
- * @author BetaSteward
- */
-public class ChatRoomIdResponse extends ClientMessage {
-    
-    private UUID chatId;
-    
-    public ChatRoomIdResponse(UUID chatId) {
-        this.chatId = chatId;
-    }
-
-    @Override
-    public void handleMessage(ClientMessageHandler handler) {
-        handler.receiveId(chatId);
-    }
-
-}
\ No newline at end of file
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/LeaveTableResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/LeaveTableResponse.java
deleted file mode 100644
index 57d52763957..00000000000
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/LeaveTableResponse.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.mage.network.messages.responses;
-
-import org.mage.network.handlers.client.ClientMessageHandler;
-import org.mage.network.messages.ClientMessage;
-
-/**
- *
- * @author BetaSteward
- */
-public class LeaveTableResponse extends ClientMessage {
-    
-    private boolean success;
-    
-    public LeaveTableResponse(boolean success) {
-        this.success = success;
-    }
-    
-    @Override
-    public void handleMessage(ClientMessageHandler handler) {
-        handler.receiveBoolean(success);
-    }
-    
-}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchResponse.java
deleted file mode 100644
index b5d0ca3419d..00000000000
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/StartMatchResponse.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.mage.network.messages.responses;
-
-import org.mage.network.handlers.client.ClientMessageHandler;
-import org.mage.network.messages.ClientMessage;
-
-/**
- *
- * @author BetaSteward
- */
-public class StartMatchResponse extends ClientMessage {
-    
-    private boolean success;
-    
-    public StartMatchResponse(boolean success) {
-        this.success = success;
-    }
-    
-    @Override
-    public void handleMessage(ClientMessageHandler handler) {
-        handler.receiveBoolean(success);
-    }
-    
-}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckResponse.java
deleted file mode 100644
index fbd9aa700c6..00000000000
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/SubmitDeckResponse.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.mage.network.messages.responses;
-
-import org.mage.network.handlers.client.ClientMessageHandler;
-import org.mage.network.messages.ClientMessage;
-
-/**
- *
- * @author BetaSteward
- */
-public class SubmitDeckResponse extends ClientMessage {
-    
-    private boolean success;
-    
-    public SubmitDeckResponse(boolean success) {
-        this.success = success;
-    }
-    
-    @Override
-    public void handleMessage(ClientMessageHandler handler) {
-        handler.receiveBoolean(success);
-    }
-    
-}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/TableViewResponse.java
similarity index 61%
rename from Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableResponse.java
rename to Mage.Network/src/main/java/org/mage/network/messages/responses/TableViewResponse.java
index 623cffe5ac4..747d134057b 100644
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/CreateTableResponse.java
+++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/TableViewResponse.java
@@ -8,17 +8,17 @@ import org.mage.network.messages.ClientMessage;
  *
  * @author BetaSteward
  */
-public class CreateTableResponse extends ClientMessage {
+public class TableViewResponse extends ClientMessage {
     
-    private TableView table;
+    private TableView view;
     
-    public CreateTableResponse(TableView table) {
-        this.table = table;
+    public TableViewResponse(TableView view) {
+        this.view = view;
     }
     
     @Override
     public void handleMessage(ClientMessageHandler handler) {
-        handler.receiveTableView(table);
+        handler.receiveTableView(view);
     }
     
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingResponse.java
deleted file mode 100644
index 320089742ed..00000000000
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/TableWaitingResponse.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.mage.network.messages.responses;
-
-import mage.view.TableView;
-import org.mage.network.handlers.client.ClientMessageHandler;
-import org.mage.network.messages.ClientMessage;
-
-/**
- *
- * @author BetaSteward
- */
-public class TableWaitingResponse extends ClientMessage {
-    
-    private TableView table;
-    
-    public TableWaitingResponse(TableView table) {
-        this.table = table;
-    }
-    
-    @Override
-    public void handleMessage(ClientMessageHandler handler) {
-        handler.receiveTableView(table);
-    }
-    
-}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameResponse.java b/Mage.Network/src/main/java/org/mage/network/messages/responses/UUIDResponse.java
similarity index 62%
rename from Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameResponse.java
rename to Mage.Network/src/main/java/org/mage/network/messages/responses/UUIDResponse.java
index d83b6e5f59e..2034a0ef235 100644
--- a/Mage.Network/src/main/java/org/mage/network/messages/responses/JoinGameResponse.java
+++ b/Mage.Network/src/main/java/org/mage/network/messages/responses/UUIDResponse.java
@@ -8,17 +8,17 @@ import org.mage.network.messages.ClientMessage;
  *
  * @author BetaSteward
  */
-public class JoinGameResponse extends ClientMessage {
+public class UUIDResponse extends ClientMessage {
     
-    private UUID chatId;
+    private UUID id;
     
-    public JoinGameResponse(UUID chatId) {
-        this.chatId = chatId;
+    public UUIDResponse(UUID id) {
+        this.id = id;
     }
 
     @Override
     public void handleMessage(ClientMessageHandler handler) {
-        handler.receiveId(chatId);
+        handler.receiveId(id);
     }
 
 }
\ No newline at end of file
diff --git a/Mage.Server/src/main/java/mage/server/ServerMain.java b/Mage.Server/src/main/java/mage/server/ServerMain.java
index c8eacc7ede7..14d15733f19 100644
--- a/Mage.Server/src/main/java/mage/server/ServerMain.java
+++ b/Mage.Server/src/main/java/mage/server/ServerMain.java
@@ -305,27 +305,22 @@ public class ServerMain implements MageServer {
         return ret;
     }
 
-//    @Override
-//    public boolean joinTournamentTable(final String sessionId, final UUID roomId, final UUID tableId, final String name, final String playerType, final int skill, final DeckCardLists deckList, final String password) throws MageException, GameException {
-//        return executeWithResult("joinTournamentTable", sessionId, new ActionWithBooleanResult() {
-//            @Override
-//            public Boolean execute() throws MageException {
-//                UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
-//                if (logger.isTraceEnabled()) {
-//                    User user = UserManager.getInstance().getUser(userId);
-//                    if (user != null) {
-//                        logger.trace("join tourn. tableId: " + tableId + " " + name);
-//                    }
-//                }                
-//                if (userId == null) {
-//                    logger.fatal("Got no userId from sessionId" + sessionId + " tableId" + tableId);
-//                    return false;
-//                }                 
-//                boolean ret = GamesRoomManager.getInstance().getRoom(roomId).joinTournamentTable(userId, tableId, name, playerType, skill, deckList, password);
-//                return ret;
-//            }
-//        });
-//    }
+    @Override
+    public boolean joinTournamentTable(final String sessionId, final UUID roomId, final UUID tableId, final String name, final String playerType, final int skill, final DeckCardLists deckList, final String password) {
+        UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
+        if (logger.isTraceEnabled()) {
+            User user = UserManager.getInstance().getUser(userId);
+            if (user != null) {
+                logger.trace("join tourn. tableId: " + tableId + " " + name);
+            }
+        }                
+        if (userId == null) {
+            logger.fatal("Got no userId from sessionId" + sessionId + " tableId" + tableId);
+            return false;
+        }                 
+        boolean ret = GamesRoomManager.getInstance().getRoom(roomId).joinTournamentTable(userId, tableId, name, playerType, skill, deckList, password);
+        return ret;
+    }
 
     @Override
     public boolean submitDeck(final String sessionId, final UUID tableId, final DeckCardLists deckList) {