From a46538fc067b3a6a9e96ac567c7a6bb131125fb0 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 1 Sep 2017 16:03:43 +0200 Subject: [PATCH] Removed some unused code. --- .../client/remote/CallbackClientImpl.java | 27 ++++++---------- .../callback/ClientCallbackMethod.java | 17 +++++++--- .../java/mage/server/draft/DraftSession.java | 31 ++++++------------- 3 files changed, 31 insertions(+), 44 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java index 6e1db68012e..386c2156a69 100644 --- a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java +++ b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java @@ -27,6 +27,10 @@ */ package mage.client.remote; +import java.awt.event.KeyEvent; +import java.util.List; +import java.util.UUID; +import javax.swing.*; import mage.cards.decks.Deck; import mage.client.MageFrame; import mage.client.SessionHandler; @@ -48,11 +52,6 @@ import mage.view.*; import mage.view.ChatMessage.MessageType; import org.apache.log4j.Logger; -import javax.swing.*; -import java.awt.event.KeyEvent; -import java.util.List; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com @@ -325,11 +324,11 @@ public class CallbackClientImpl implements CallbackClient { break; } case VIEW_LIMITED_DECK: { - TableClientMessage message = (TableClientMessage) callback.getData(); - DeckView deckView = message.getDeck(); - Deck deck = DeckUtil.construct(deckView); - viewLimitedDeck(deck, message.getTableId(), message.getTime()); - break; + TableClientMessage message = (TableClientMessage) callback.getData(); + DeckView deckView = message.getDeck(); + Deck deck = DeckUtil.construct(deckView); + viewLimitedDeck(deck, message.getTableId(), message.getTime()); + break; } case CONSTRUCT: { TableClientMessage message = (TableClientMessage) callback.getData(); @@ -356,14 +355,6 @@ public class CallbackClientImpl implements CallbackClient { } break; } - case DRAFT_INFORM: // if (callback.getMessageId() > messageId) { - { - DraftClientMessage message = (DraftClientMessage) callback.getData(); - } -// } else { -// logger.warn("message out of sequence - ignoring"); -// } - break; case DRAFT_INIT: { DraftClientMessage message = (DraftClientMessage) callback.getData(); DraftPanel panel = MageFrame.getDraft(callback.getObjectId()); diff --git a/Mage.Common/src/main/java/mage/interfaces/callback/ClientCallbackMethod.java b/Mage.Common/src/main/java/mage/interfaces/callback/ClientCallbackMethod.java index 9a74ad6e2a9..cf9e43df398 100644 --- a/Mage.Common/src/main/java/mage/interfaces/callback/ClientCallbackMethod.java +++ b/Mage.Common/src/main/java/mage/interfaces/callback/ClientCallbackMethod.java @@ -30,18 +30,27 @@ public enum ClientCallbackMethod { GAME_UPDATE("gameUpdate"), DRAFT_OVER("draftOver"), REPLAY_DONE("replayDone"), - USER_REQUEST_DIALOG("userRequestDialog"), + USER_REQUEST_DIALOG("userRequestDialog"), REPLAY_UPDATE("replayUpdate"), REPLAY_INIT("replayInit"), END_GAME_INFO("endGameInfo"), GAME_TARGET("gameTarget"), - GAME_CHOOSE_ABILITY("gameChooseAbility"), + GAME_CHOOSE_ABILITY("gameChooseAbility"), GAME_CHOOSE_PILE("gameChoosePile"), - GAME_CHOOSE_CHOICE("gameChooseChoice"), GAME_ASK("gameAsk"), GAME_SELECT("gameSelect"), GAME_PLAY_MANA("gamePlayMana"), GAME_PLAY_XMANA("gamePlayXMana"), GAME_GET_AMOUNT("gameSelectAmount"), DRAFT_INIT("draftInit"), DRAFT_INFORM("draftInform"), DRAFT_PICK("draftPick"), DRAFT_UPDATE("draftUpdate"); + GAME_CHOOSE_CHOICE("gameChooseChoice"), + GAME_ASK("gameAsk"), + GAME_SELECT("gameSelect"), + GAME_PLAY_MANA("gamePlayMana"), + GAME_PLAY_XMANA("gamePlayXMana"), + GAME_GET_AMOUNT("gameSelectAmount"), + DRAFT_INIT("draftInit"), + // DRAFT_INFORM("draftInform"), + DRAFT_PICK("draftPick"), + DRAFT_UPDATE("draftUpdate"); String value; - ClientCallbackMethod(String value){ + ClientCallbackMethod(String value) { this.value = value; } } diff --git a/Mage.Server/src/main/java/mage/server/draft/DraftSession.java b/Mage.Server/src/main/java/mage/server/draft/DraftSession.java index 3992af7ca25..3f3984eaf3d 100644 --- a/Mage.Server/src/main/java/mage/server/draft/DraftSession.java +++ b/Mage.Server/src/main/java/mage/server/draft/DraftSession.java @@ -24,10 +24,16 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ package mage.server.draft; +import java.rmi.RemoteException; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import mage.game.draft.Draft; import mage.interfaces.callback.ClientCallback; import mage.interfaces.callback.ClientCallbackMethod; @@ -39,14 +45,6 @@ import mage.view.DraftPickView; import mage.view.DraftView; import org.apache.log4j.Logger; -import java.rmi.RemoteException; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - /** * @author BetaSteward_at_googlemail.com */ @@ -89,21 +87,10 @@ public class DraftSession { UserManager.instance .getUser(userId). ifPresent(user -> user.fireCallback( - new ClientCallback(ClientCallbackMethod.DRAFT_UPDATE, draft.getId(), getDraftView()))); + new ClientCallback(ClientCallbackMethod.DRAFT_UPDATE, draft.getId(), getDraftView()))); } } - // not used - // - public void inform(final String message) { - if (!killed) { - UserManager.instance - .getUser(userId) - .ifPresent(user -> user.fireCallback(new ClientCallback(ClientCallbackMethod.DRAFT_INFORM, draft.getId(), new DraftClientMessage(getDraftView(), message)))); - } - - } - public void draftOver() { if (!killed) { UserManager.instance