diff --git a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java index 84ad88b1479..aaf3eef32a7 100644 --- a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java @@ -44,12 +44,14 @@ import java.awt.event.MouseEvent; import java.io.Serializable; import java.util.Map; import java.util.UUID; -import java.util.logging.Logger; + import javax.swing.SwingUtilities; + import mage.client.MageFrame; import mage.client.components.MageTextArea; import mage.client.remote.Session; -import mage.util.Logging; + +import org.apache.log4j.Logger; /** * @@ -57,7 +59,7 @@ import mage.util.Logging; */ public class FeedbackPanel extends javax.swing.JPanel { - private final static Logger logger = Logging.getLogger(FeedbackPanel.class.getName()); + private final static Logger logger = Logger.getLogger(FeedbackPanel.class); public enum FeedbackMode { INFORM, QUESTION, CONFIRM, CANCEL, SELECT @@ -79,6 +81,7 @@ public class FeedbackPanel extends javax.swing.JPanel { } public void getFeedback(FeedbackMode mode, String message, boolean modal, boolean special, Map options) { + logger.info("text: " + message); this.lblMessage.setText(message); this.selected = false; this.mode = mode; @@ -136,6 +139,7 @@ public class FeedbackPanel extends javax.swing.JPanel { this.btnRight.setVisible(false); this.btnSpecial.setVisible(false); this.lblMessage.setText(""); + logger.info("feedback - clear"); } private synchronized void startModal() { @@ -164,7 +168,7 @@ public class FeedbackPanel extends javax.swing.JPanel { } else if (source instanceof MenuComponent) { ((MenuComponent) source).dispatchEvent(event); } else { - logger.warning("Unable to dispatch: " + event); + logger.warn("Unable to dispatch: " + event); } } } diff --git a/Mage.Client/src/main/java/mage/client/remote/Client.java b/Mage.Client/src/main/java/mage/client/remote/Client.java index 1f06e92af54..ed5d894c884 100644 --- a/Mage.Client/src/main/java/mage/client/remote/Client.java +++ b/Mage.Client/src/main/java/mage/client/remote/Client.java @@ -79,6 +79,7 @@ public class Client implements CallbackClient { @Override public void run() { try { + logger.info(callback.getMessageId() + " -- " + callback.getMethod()); if (callback.getMethod().equals("startGame")) { TableClientMessage message = (TableClientMessage) callback.getData(); GameManager.getInstance().setCurrentPlayerUUID(message.getPlayerId()); @@ -188,6 +189,7 @@ public class Client implements CallbackClient { panel.updateGame((GameView) callback.getData()); } else if (callback.getMethod().equals("gameInform")) { + if (callback.getMessageId() > messageId) { GameClientMessage message = (GameClientMessage) callback.getData(); GamePanel panel = session.getGame(callback.getObjectId()); diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index bb2f03ca67a..f9184a292c4 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -445,10 +445,10 @@ class UpdateTablesTask extends SwingWorker> { protected Void doInBackground() throws Exception { while (!isCancelled()) { this.publish(session.getTables(roomId)); - logger.info("connected players:"); + /*logger.info("connected players:"); for (String player : session.getConnectedPlayers(roomId)) { logger.info(" " + player); - } + }*/ Thread.sleep(1000); } return null;