From c085ea148a20e8f5505a9cf7ccb7e4baa24cfa05 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 23 Apr 2017 14:11:02 +0200 Subject: [PATCH] * Changed some logging messages. --- .../java/mage/server/TableController.java | 24 +++++++++---------- .../java/mage/cards/decks/Constructed.java | 3 --- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index be9854ae52..4850c95668 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -27,6 +27,14 @@ */ package mage.server; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import mage.MageException; import mage.cards.decks.Deck; import mage.cards.decks.DeckCardLists; @@ -61,15 +69,6 @@ import mage.server.util.ThreadExecutor; import mage.view.ChatMessage; import org.apache.log4j.Logger; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - /** * @author BetaSteward_at_googlemail.com */ @@ -345,15 +344,14 @@ public class TableController { Optional playerOpt = createPlayer(name, seat.getPlayerType(), skill); if (!playerOpt.isPresent()) { - String message = new StringBuilder("Could not create player ").append(name).append(" of type ").append(seat.getPlayerType()).toString(); - logger.warn(new StringBuilder("User: ").append(user.getName()).append(" => ").append(message).toString()); + String message = "Could not create player " + name + " of type " + seat.getPlayerType(); + logger.warn("User: " + user.getName() + " => " + message); user.showUserMessage("Join Table", message); return false; } Player player = playerOpt.get(); - logger.debug("DECK validated: " + table.getValidator().getName() + ' ' + player.getName() + ' ' + deck.getName()); if (!player.canJoinTable(table)) { - user.showUserMessage("Join Table", new StringBuilder("A ").append(seat.getPlayerType()).append(" player can't join this table.").toString()); + user.showUserMessage("Join Table", "A " + seat.getPlayerType() + " player can't join this table."); return false; } match.addPlayer(player, deck); diff --git a/Mage/src/main/java/mage/cards/decks/Constructed.java b/Mage/src/main/java/mage/cards/decks/Constructed.java index dc15a1e9ce..8229a64bcb 100644 --- a/Mage/src/main/java/mage/cards/decks/Constructed.java +++ b/Mage/src/main/java/mage/cards/decks/Constructed.java @@ -62,7 +62,6 @@ public class Constructed extends DeckValidator { @Override public boolean validate(Deck deck) { - logger.debug("DECK validate start: " + name + " deckname: " + deck.getName()); boolean valid = true; //20091005 - 100.2a if (deck.getCards().size() < 60) { @@ -136,8 +135,6 @@ public class Constructed extends DeckValidator { } } } - - logger.debug("DECK validate end: " + name + " deckname: " + deck.getName() + " invalids:" + invalid.size()); return valid; }