From bfb428b13aa4103adcb848ce45e764858eb6f1ca Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Sun, 22 Nov 2015 22:34:02 -0800 Subject: [PATCH] always use log4j removed all references to mage.util.Logging, java.util.logging transient static doesn't mean anything, since static fields are never included in serialization --- .../components/ability/AbilityPicker.java | 2 +- .../client/dialog/CardInfoWindowDialog.java | 7 +- .../mage/client/dialog/FeedbackDialog.java | 2 +- .../mage/client/dialog/PreferencesDialog.java | 2 +- .../java/mage/client/draft/DraftPanel.java | 9 +- .../mage/client/unusedFiles/CombatDialog.java | 8 +- .../main/java/mage/client/util/DeckUtil.java | 2 +- .../mage/utils/properties/PropertiesUtil.java | 7 +- Mage.Common/src/mage/view/GameView.java | 2 +- .../src/mage/player/ai/ComputerPlayer6.java | 3 +- .../src/mage/player/ai/ComputerPlayer7.java | 2 +- .../src/mage/player/ai/Config2.java | 11 +- .../mage/player/ai/GameStateEvaluator2.java | 3 +- .../src/mage/player/ai/SimulatedPlayer2.java | 2 +- .../src/mage/player/ai/SimulationWorker2.java | 8 +- .../src/mage/player/ai/util/CombatUtil.java | 3 +- .../java/mage/player/ai/ComputerPlayer.java | 2 +- .../mage/player/ai/ComputerPlayerMCTS.java | 2 +- .../src/mage/player/ai/MCTSExecutor.java | 2 +- .../src/mage/player/ai/MCTSNode.java | 2 +- .../src/mage/player/ai/MCTSPlayer.java | 2 +- .../mage/player/ai/SimulatedPlayerMCTS.java | 2 +- .../src/mage/player/ai/ComputerPlayer2.java | 4 +- .../src/mage/player/ai/ComputerPlayer3.java | 2 +- .../mage/player/ai/GameStateEvaluator.java | 2 +- .../mage/player/ai/SimulateBlockWorker.java | 9 +- .../src/mage/player/ai/SimulatedPlayer.java | 2 +- .../src/mage/player/ai/SimulationWorker.java | 8 +- .../sets/journeyintonyx/QuarryColossus.java | 1 - .../mage/test/load/LoadCallbackClient.java | 2 +- .../org/mage/test/load/SimpleMageClient.java | 2 +- Mage/src/mage/MageObjectReference.java | 2 +- Mage/src/mage/ObjectColor.java | 2 +- Mage/src/mage/abilities/AbilitiesImpl.java | 2 +- Mage/src/mage/abilities/AbilityImpl.java | 4 +- .../abilities/effects/ContinuousEffects.java | 2 +- .../score/ArtificialScoringSystem.java | 2 +- Mage/src/mage/cards/CardsImpl.java | 2 +- Mage/src/mage/game/GameImpl.java | 2 +- Mage/src/mage/game/GameState.java | 2 +- Mage/src/mage/game/GameStates.java | 2 +- .../mage/game/permanent/PermanentImpl.java | 2 +- Mage/src/mage/game/turn/Turn.java | 2 +- Mage/src/mage/players/PlayerImpl.java | 2 +- Mage/src/mage/util/Logging.java | 104 ------------------ 45 files changed, 71 insertions(+), 178 deletions(-) delete mode 100644 Mage/src/mage/util/Logging.java diff --git a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java index 91b761fa44e..96724c38d09 100644 --- a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java +++ b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java @@ -29,7 +29,7 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener { private static final int DIALOG_WIDTH = 440; private static final int DIALOG_HEIGHT = 260; - private transient static final Logger log = Logger.getLogger(AbilityPicker.class); + private static final Logger log = Logger.getLogger(AbilityPicker.class); private JList rows; private List choices; diff --git a/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java index 284852f6c0b..59b6a23fa66 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java @@ -36,8 +36,6 @@ package mage.client.dialog; import java.awt.Point; import java.beans.PropertyVetoException; import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.ImageIcon; import javax.swing.SwingUtilities; import javax.swing.event.InternalFrameAdapter; @@ -50,6 +48,7 @@ import mage.client.util.gui.GuiDisplayUtil; import mage.view.CardsView; import mage.view.ExileView; import mage.view.SimpleCardsView; +import org.apache.log4j.Logger; import org.mage.plugins.card.utils.impl.ImageManagerImpl; /** @@ -58,6 +57,8 @@ import org.mage.plugins.card.utils.impl.ImageManagerImpl; */ public class CardInfoWindowDialog extends MageDialog { + private static final Logger logger = Logger.getLogger(CardInfoWindowDialog.class); + public static enum ShowType { REVEAL, REVEAL_TOP_LIBRARY, LOOKED_AT, EXILE, GRAVEYARD, OTHER @@ -123,7 +124,7 @@ public class CardInfoWindowDialog extends MageDialog { try { this.setIcon(false); } catch (PropertyVetoException ex) { - Logger.getLogger(CardInfoWindowDialog.class.getName()).log(Level.SEVERE, null, ex); + logger.error(null, ex); } } } else { diff --git a/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java b/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java index dc3c892658e..dfe0a233092 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java @@ -40,7 +40,7 @@ import javax.swing.*; */ public class FeedbackDialog extends javax.swing.JDialog { - private static final transient Logger log = Logger.getLogger(PreferencesDialog.class); + private static final Logger log = Logger.getLogger(PreferencesDialog.class); private String[] feedbackTypes = {"", "Bug or \"something doesn't work\"", "Feature or \"I need that function\"", diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java index 494ff1900a9..2d464312ebe 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java @@ -78,7 +78,7 @@ import org.apache.log4j.Logger; */ public class PreferencesDialog extends javax.swing.JDialog { - private static final transient Logger log = Logger.getLogger(PreferencesDialog.class); + private static final Logger log = Logger.getLogger(PreferencesDialog.class); public static final String KEY_HAND_USE_BIG_CARDS = "handUseBigCards"; public static final String KEY_SHOW_TOOLTIPS_ANY_ZONE = "showTooltipsInAnyZone"; diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java index 31269b247f4..679cb823d06 100644 --- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java +++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java @@ -53,8 +53,6 @@ import java.util.LinkedList; import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JComponent; @@ -82,6 +80,7 @@ import mage.view.DraftPickView; import mage.view.DraftView; import mage.view.SimpleCardView; import mage.view.SimpleCardsView; +import org.apache.log4j.Logger; /** * @@ -89,6 +88,8 @@ import mage.view.SimpleCardsView; */ public class DraftPanel extends javax.swing.JPanel { + private static final Logger logger = Logger.getLogger(DraftPanel.class); + private UUID draftId; private Session session; private Timer countdown; @@ -185,7 +186,7 @@ public class DraftPanel extends javax.swing.JPanel { try { Files.write(pathToDraftLog(), "".getBytes(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); } catch (IOException ex) { - Logger.getLogger(DraftPanel.class.getName()).log(Level.SEVERE, null, ex); + logger.error(null, ex); } } else { logFilename = null; @@ -523,7 +524,7 @@ public class DraftPanel extends javax.swing.JPanel { try { Files.write(pathToDraftLog(), data.getBytes(), StandardOpenOption.APPEND); } catch (IOException ex) { - Logger.getLogger(DraftPanel.class.getName()).log(Level.SEVERE, null, ex); + logger.error(null, ex); } } diff --git a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java index b5fc4b3ffd3..57a0b6cf80e 100644 --- a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java +++ b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java @@ -36,7 +36,6 @@ package mage.client.unusedFiles; import mage.client.cards.BigCard; -import mage.client.unusedFiles.CombatGroup; import mage.view.CombatGroupView; import javax.swing.*; @@ -44,9 +43,8 @@ import java.awt.*; import java.beans.PropertyVetoException; import java.util.List; import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; import mage.client.dialog.MageDialog; +import org.apache.log4j.Logger; /** * @@ -54,6 +52,8 @@ import mage.client.dialog.MageDialog; */ public class CombatDialog extends MageDialog { + private static final Logger logger = Logger.getLogger(CombatDialog.class); + private UUID gameId; private BigCard bigCard; private int lastX = 500; @@ -100,7 +100,7 @@ public class CombatDialog extends MageDialog { try { this.setSelected(true); } catch (PropertyVetoException ex) { - Logger.getLogger(CombatDialog.class.getName()).log(Level.SEVERE, null, ex); + logger.error(null, ex); } pack(); this.revalidate(); diff --git a/Mage.Client/src/main/java/mage/client/util/DeckUtil.java b/Mage.Client/src/main/java/mage/client/util/DeckUtil.java index 1b240c389ce..930b1c777db 100644 --- a/Mage.Client/src/main/java/mage/client/util/DeckUtil.java +++ b/Mage.Client/src/main/java/mage/client/util/DeckUtil.java @@ -43,7 +43,7 @@ import org.apache.log4j.Logger; */ public class DeckUtil { - private static final transient Logger log = Logger.getLogger(DeckUtil.class); + private static final Logger log = Logger.getLogger(DeckUtil.class); private DeckUtil() { } diff --git a/Mage.Common/src/mage/utils/properties/PropertiesUtil.java b/Mage.Common/src/mage/utils/properties/PropertiesUtil.java index 50d1bfdbb1f..87a936131f8 100644 --- a/Mage.Common/src/mage/utils/properties/PropertiesUtil.java +++ b/Mage.Common/src/mage/utils/properties/PropertiesUtil.java @@ -1,7 +1,6 @@ package mage.utils.properties; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; +import org.apache.log4j.Logger; import java.io.IOException; import java.io.InputStream; @@ -12,7 +11,7 @@ import java.util.Properties; */ public class PropertiesUtil { - private static final Logger logger = LoggerFactory.getLogger(PropertiesUtil.class); + private static final Logger logger = Logger.getLogger(PropertiesUtil.class); private static final String LOG_JDBC_URL = "jdbc:h2:file:./db/mage.h2;AUTO_SERVER=TRUE"; private static final String FEEDBACK_JDBC_URL = "jdbc:h2:file:./db/feedback.h2;AUTO_SERVER=TRUE"; @@ -25,7 +24,7 @@ public class PropertiesUtil { try { properties.load(in); } catch (IOException e) { - logger.error(e, "Couldn't load properties"); + logger.error("Couldn't load properties", e); } } else { logger.warn("No xmage.properties were found on classpath"); diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index ad27715f417..7060d19ab91 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -62,7 +62,7 @@ public class GameView implements Serializable { private static final long serialVersionUID = 1L; - private static final transient Logger logger = Logger.getLogger(GameView.class); + private static final Logger logger = Logger.getLogger(GameView.class); private final int priorityTime; private final List players = new ArrayList<>(); diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java index 128c502cc63..37cce686334 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java @@ -104,6 +104,7 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetCard; import mage.target.Targets; +import org.apache.log4j.Logger; /** * @@ -111,7 +112,7 @@ import mage.target.Targets; */ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { - private static final transient org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(ComputerPlayer6.class); + private static final Logger logger = Logger.getLogger(ComputerPlayer6.class); private static final ExecutorService pool = Executors.newFixedThreadPool(1); protected int maxDepth; protected int maxNodes; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java index 22037b2ad53..3822c054646 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java @@ -74,7 +74,7 @@ import org.apache.log4j.Logger; */ public class ComputerPlayer7 extends ComputerPlayer6 { - private static final transient Logger logger = Logger.getLogger(ComputerPlayer7.class); + private static final Logger logger = Logger.getLogger(ComputerPlayer7.class); private boolean allowBadMoves; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java index 6123868991c..55d87f6914e 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java @@ -28,14 +28,13 @@ package mage.player.ai; +import org.apache.log4j.Logger; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.net.URISyntaxException; import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; -import mage.util.Logging; /** * @@ -43,7 +42,7 @@ import mage.util.Logging; */ public class Config2 { - private static final Logger logger = Logging.getLogger(Config2.class.getName()); + private static final Logger logger = Logger.getLogger(Config2.class); // public static final int maxDepth; public static final int maxNodes; @@ -70,9 +69,9 @@ public class Config2 { // p.setProperty("maxThinkSeconds", "30"); } } catch (IOException ex) { - logger.log(Level.SEVERE, null, ex); + logger.error(null, ex); } catch (URISyntaxException ex) { - Logger.getLogger(Config2.class.getName()).log(Level.SEVERE, null, ex); + logger.error(null, ex); } // maxDepth = Integer.parseInt(p.getProperty("maxDepth")); maxNodes = Integer.parseInt(p.getProperty("maxNodes")); diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java index 0e2c9f409c1..68661f92b86 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java @@ -9,6 +9,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.player.ai.ma.ArtificialScoringSystem; import mage.players.Player; +import org.apache.log4j.Logger; /** * @@ -19,7 +20,7 @@ import mage.players.Player; */ public class GameStateEvaluator2 { - private static final transient org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(GameStateEvaluator2.class); + private static final Logger logger = Logger.getLogger(GameStateEvaluator2.class); public static final int WIN_GAME_SCORE = 100000000; public static final int LOSE_GAME_SCORE = -WIN_GAME_SCORE; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java index fce50c8ff20..058d42b6e6d 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java @@ -63,7 +63,7 @@ import org.apache.log4j.Logger; */ public class SimulatedPlayer2 extends ComputerPlayer { - private static final transient Logger logger = Logger.getLogger(SimulatedPlayer2.class); + private static final Logger logger = Logger.getLogger(SimulatedPlayer2.class); private final boolean isSimulatedPlayer; private transient ConcurrentLinkedQueue allActions; private boolean forced; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java index 991947bcb87..971cd3698e5 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java @@ -29,11 +29,9 @@ package mage.player.ai; import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; import mage.abilities.Ability; import mage.game.Game; -import mage.util.Logging; +import org.apache.log4j.Logger; /** * @@ -41,7 +39,7 @@ import mage.util.Logging; */ public class SimulationWorker2 implements Callable { - private static final Logger logger = Logging.getLogger(SimulationWorker2.class.getName()); + private static final Logger logger = Logger.getLogger(SimulationWorker2.class); private Game game; private SimulatedAction2 previousActions; @@ -60,7 +58,7 @@ public class SimulationWorker2 implements Callable { try { // player.simulateAction(game, previousActions, action); } catch (Exception ex) { - logger.log(Level.SEVERE, null, ex); + logger.error(null, ex); } return null; } diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/util/CombatUtil.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/util/CombatUtil.java index 262523582ef..a5118936766 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/util/CombatUtil.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/util/CombatUtil.java @@ -12,6 +12,7 @@ import mage.game.turn.EndOfCombatStep; import mage.game.turn.FirstCombatDamageStep; import mage.game.turn.Step; import mage.players.Player; +import org.apache.log4j.Logger; import java.util.*; @@ -24,7 +25,7 @@ public class CombatUtil { private static final List emptyList = new ArrayList(); - private static final transient org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(CombatUtil.class); + private static final Logger log = Logger.getLogger(CombatUtil.class); private CombatUtil() { } diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 69424906f56..6e2acbb8fa9 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -160,7 +160,7 @@ import org.apache.log4j.Logger; */ public class ComputerPlayer extends PlayerImpl implements Player { - private transient final static Logger log = Logger.getLogger(ComputerPlayer.class); + private static final Logger log = Logger.getLogger(ComputerPlayer.class); protected int PASSIVITY_PENALTY = 5; // Penalty value for doing nothing if some actions are availble protected boolean ALLOW_INTERRUPT = true; // change this for test / debugging purposes to false to switch off interrupts while debugging diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java index c620bb68407..e36bde422eb 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java @@ -62,7 +62,7 @@ public class ComputerPlayerMCTS extends ComputerPlayer implements Player { protected transient MCTSNode root; protected int maxThinkTime; - private static final transient Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); + private static final Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); private int poolSize; public ComputerPlayerMCTS(String name, RangeOfInfluence range, int skill) { diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java index 1e12abdcc7b..e46c0ed9a91 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java @@ -43,7 +43,7 @@ public class MCTSExecutor implements Callable { protected UUID playerId; protected int simCount; - private static final transient Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); + private static final Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); public MCTSExecutor(Game sim, UUID playerId, int thinkTime) { this.playerId = playerId; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java index eacf86be8b5..f28f8683921 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java @@ -57,7 +57,7 @@ public class MCTSNode { public static final boolean USE_ACTION_CACHE = false; private static final double selectionCoefficient = Math.sqrt(2.0); private static final double passRatioTolerance = 0.0; - private static final transient Logger logger = Logger.getLogger(MCTSNode.class); + private static final Logger logger = Logger.getLogger(MCTSNode.class); private int visits = 0; private int wins = 0; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java index e653bc80db8..9c2769eb1dc 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class MCTSPlayer extends ComputerPlayer { - private static final transient Logger logger = Logger.getLogger(MCTSPlayer.class); + private static final Logger logger = Logger.getLogger(MCTSPlayer.class); protected PassAbility pass = new PassAbility(); diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java index 94633b9f034..6e0ffde4447 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java @@ -66,7 +66,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer { private boolean isSimulatedPlayer; private static Random rnd = new Random(); private int actionCount = 0; - private static final transient Logger logger = Logger.getLogger(SimulatedPlayerMCTS.class); + private static final Logger logger = Logger.getLogger(SimulatedPlayerMCTS.class); public SimulatedPlayerMCTS(UUID id, boolean isSimulatedPlayer) { super(id); diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java index 496bf0a47af..bc43063666e 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java @@ -60,8 +60,8 @@ import java.util.concurrent.*; */ public class ComputerPlayer2 extends ComputerPlayer implements Player { - private static final transient Logger logger = Logger.getLogger(ComputerPlayer2.class); - private static final transient ExecutorService pool = Executors.newFixedThreadPool(1); + private static final Logger logger = Logger.getLogger(ComputerPlayer2.class); + private static final ExecutorService pool = Executors.newFixedThreadPool(1); protected int maxDepth; protected int maxNodes; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java index 8b2d9cfaf17..c01bed8a68e 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java @@ -49,7 +49,7 @@ import java.util.UUID; */ public class ComputerPlayer3 extends ComputerPlayer2 implements Player { - private static final transient Logger logger = Logger.getLogger(ComputerPlayer3.class); + private static final Logger logger = Logger.getLogger(ComputerPlayer3.class); public ComputerPlayer3(String name, RangeOfInfluence range, int skill) { super(name, range, skill); diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java index 920b00d2520..16e131031eb 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java @@ -53,7 +53,7 @@ import org.apache.log4j.Logger; */ public class GameStateEvaluator { - private static final transient Logger logger = Logger.getLogger(GameStateEvaluator.class); + private static final Logger logger = Logger.getLogger(GameStateEvaluator.class); private static final int LIFE_FACTOR = Config.evaluatorLifeFactor; private static final int PERMANENT_FACTOR = Config.evaluatorPermanentFactor; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java index 10f315c56d7..97dc7bf9da4 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java @@ -28,10 +28,9 @@ package mage.player.ai; +import org.apache.log4j.Logger; + import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; -import mage.util.Logging; /** * @@ -39,7 +38,7 @@ import mage.util.Logging; */ public class SimulateBlockWorker implements Callable { - private static final Logger logger = Logging.getLogger(SimulationWorker.class.getName()); + private static final Logger logger = Logger.getLogger(SimulationWorker.class); private SimulationNode node; private ComputerPlayer3 player; @@ -54,7 +53,7 @@ public class SimulateBlockWorker implements Callable { try { // player.simulateBlock(node); } catch (Exception ex) { - logger.log(Level.SEVERE, null, ex); + logger.error(null, ex); } return null; } diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java index a43eddaa763..a7547ce9649 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java @@ -51,7 +51,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; */ public class SimulatedPlayer extends ComputerPlayer { - private static final transient Logger logger = Logger.getLogger(SimulatedPlayer.class); + private static final Logger logger = Logger.getLogger(SimulatedPlayer.class); private boolean isSimulatedPlayer; private transient ConcurrentLinkedQueue allActions; private static PassAbility pass = new PassAbility(); diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java index 2d185c8096b..41ef901f423 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java @@ -29,11 +29,9 @@ package mage.player.ai; import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; import mage.abilities.Ability; import mage.game.Game; -import mage.util.Logging; +import org.apache.log4j.Logger; /** * @@ -41,7 +39,7 @@ import mage.util.Logging; */ public class SimulationWorker implements Callable { - private static final Logger logger = Logging.getLogger(SimulationWorker.class.getName()); + private static final Logger logger = Logger.getLogger(SimulationWorker.class); private Game game; private SimulatedAction previousActions; @@ -60,7 +58,7 @@ public class SimulationWorker implements Callable { try { // player.simulateAction(game, previousActions, action); } catch (Exception ex) { - logger.log(Level.SEVERE, null, ex); + logger.error(null, ex); } return null; } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java b/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java index bc3084b4b15..b906849775c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java @@ -30,7 +30,6 @@ package mage.sets.journeyintonyx; import java.util.Deque; import java.util.LinkedList; import java.util.UUID; -import java.util.logging.Logger; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage.Tests/src/test/java/org/mage/test/load/LoadCallbackClient.java b/Mage.Tests/src/test/java/org/mage/test/load/LoadCallbackClient.java index 7a4e7cfa9ee..8f6943bd0d5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/LoadCallbackClient.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/LoadCallbackClient.java @@ -17,7 +17,7 @@ import java.util.UUID; */ public class LoadCallbackClient implements CallbackClient { - private static final transient Logger log = Logger.getLogger(LoadCallbackClient.class); + private static final Logger log = Logger.getLogger(LoadCallbackClient.class); private Session session; private UUID gameId; diff --git a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java index 88f0532070a..deb80b873c1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java @@ -18,7 +18,7 @@ public class SimpleMageClient implements MageClient { private final UUID clientId; private static final MageVersion version = new MageVersion(MageVersion.MAGE_VERSION_MAJOR, MageVersion.MAGE_VERSION_MINOR, MageVersion.MAGE_VERSION_PATCH, MageVersion.MAGE_VERSION_MINOR_PATCH, MageVersion.MAGE_VERSION_INFO); - private static final transient Logger log = Logger.getLogger(SimpleMageClient.class); + private static final Logger log = Logger.getLogger(SimpleMageClient.class); private final CallbackClient callbackClient; diff --git a/Mage/src/mage/MageObjectReference.java b/Mage/src/mage/MageObjectReference.java index 85edcc3c625..b2516798d20 100644 --- a/Mage/src/mage/MageObjectReference.java +++ b/Mage/src/mage/MageObjectReference.java @@ -44,7 +44,7 @@ import org.apache.log4j.Logger; */ public class MageObjectReference implements Comparable, Serializable { - private static final transient Logger logger = Logger.getLogger(MageObjectReference.class); + private static final Logger logger = Logger.getLogger(MageObjectReference.class); private final UUID sourceId; private final int zoneChangeCounter; diff --git a/Mage/src/mage/ObjectColor.java b/Mage/src/mage/ObjectColor.java index c34ea4269d5..dca7bfabd2e 100644 --- a/Mage/src/mage/ObjectColor.java +++ b/Mage/src/mage/ObjectColor.java @@ -35,7 +35,7 @@ import mage.util.ThreadLocalStringBuilder; public class ObjectColor implements Serializable, Copyable, Comparable { - private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(10); + private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(10); public static final ObjectColor WHITE = new ObjectColor("W"); public static final ObjectColor BLUE = new ObjectColor("U"); diff --git a/Mage/src/mage/abilities/AbilitiesImpl.java b/Mage/src/mage/abilities/AbilitiesImpl.java index 3e3b4d7ebd1..bec3cc96efb 100644 --- a/Mage/src/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/mage/abilities/AbilitiesImpl.java @@ -50,7 +50,7 @@ import mage.util.ThreadLocalStringBuilder; */ public class AbilitiesImpl extends ArrayList implements Abilities { - private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(200); + private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(200); public AbilitiesImpl() {} diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index 79734e20238..c4d7e73616a 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -84,8 +84,8 @@ import org.apache.log4j.Logger; */ public abstract class AbilityImpl implements Ability { - private static final transient Logger logger = Logger.getLogger(AbilityImpl.class); - private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(100); + private static final Logger logger = Logger.getLogger(AbilityImpl.class); + private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(100); private static final List emptyWatchers = new ArrayList<>(); private static final List emptyAbilities = new ArrayList<>(); diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java index fdffd3f1188..6d6c73d06d4 100644 --- a/Mage/src/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java @@ -82,7 +82,7 @@ import org.apache.log4j.Logger; */ public class ContinuousEffects implements Serializable { - private static final transient Logger logger = Logger.getLogger(ContinuousEffects.class); + private static final Logger logger = Logger.getLogger(ContinuousEffects.class); private long order = 0; diff --git a/Mage/src/mage/actions/score/ArtificialScoringSystem.java b/Mage/src/mage/actions/score/ArtificialScoringSystem.java index ebd1ee066d5..cc8688a8490 100644 --- a/Mage/src/mage/actions/score/ArtificialScoringSystem.java +++ b/Mage/src/mage/actions/score/ArtificialScoringSystem.java @@ -11,7 +11,7 @@ public class ArtificialScoringSystem implements ScoringSystem { public static ArtificialScoringSystem inst; - private static final transient Logger log = Logger.getLogger(ArtificialScoringSystem.class); + private static final Logger log = Logger.getLogger(ArtificialScoringSystem.class); static { inst = new ArtificialScoringSystem(); diff --git a/Mage/src/mage/cards/CardsImpl.java b/Mage/src/mage/cards/CardsImpl.java index ee177f0741e..a33afd45810 100644 --- a/Mage/src/mage/cards/CardsImpl.java +++ b/Mage/src/mage/cards/CardsImpl.java @@ -49,7 +49,7 @@ import mage.util.ThreadLocalStringBuilder; */ public class CardsImpl extends LinkedHashSet implements Cards, Serializable { - private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(200); + private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(200); private static Random rnd = new Random(); private UUID ownerId; diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index bf2d5144952..54797d22c3e 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -138,7 +138,7 @@ public abstract class GameImpl implements Game, Serializable { private static final int ROLLBACK_TURNS_MAX = 4; - private static final transient Logger logger = Logger.getLogger(GameImpl.class); + private static final Logger logger = Logger.getLogger(GameImpl.class); private static final FilterPermanent filterAura = new FilterPermanent(); private static final FilterPermanent filterEquipment = new FilterPermanent(); diff --git a/Mage/src/mage/game/GameState.java b/Mage/src/mage/game/GameState.java index 0119c0920ee..748ead016f2 100644 --- a/Mage/src/mage/game/GameState.java +++ b/Mage/src/mage/game/GameState.java @@ -86,7 +86,7 @@ import mage.watchers.Watchers; */ public class GameState implements Serializable, Copyable { - private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(1024); + private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(1024); private final Players players; private final PlayerList playerList; diff --git a/Mage/src/mage/game/GameStates.java b/Mage/src/mage/game/GameStates.java index e88e45c27d7..b65cbccea3c 100644 --- a/Mage/src/mage/game/GameStates.java +++ b/Mage/src/mage/game/GameStates.java @@ -40,7 +40,7 @@ import java.util.List; */ public class GameStates implements Serializable { - private static final transient Logger logger = Logger.getLogger(GameStates.class); + private static final Logger logger = Logger.getLogger(GameStates.class); // private final List states; private final List states; diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/mage/game/permanent/PermanentImpl.java index 3b767772abc..b1f15c03398 100644 --- a/Mage/src/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/mage/game/permanent/PermanentImpl.java @@ -84,7 +84,7 @@ import mage.util.ThreadLocalStringBuilder; */ public abstract class PermanentImpl extends CardImpl implements Permanent { - private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(300); + private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(300); protected boolean tapped; protected boolean flipped; diff --git a/Mage/src/mage/game/turn/Turn.java b/Mage/src/mage/game/turn/Turn.java index 30a367814ca..9239e55e8b6 100644 --- a/Mage/src/mage/game/turn/Turn.java +++ b/Mage/src/mage/game/turn/Turn.java @@ -49,7 +49,7 @@ import mage.util.ThreadLocalStringBuilder; */ public class Turn implements Serializable { - private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(50); + private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(50); private Phase currentPhase; private UUID activePlayerId; diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index 3cf0240b476..8c180e2fec5 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -136,7 +136,7 @@ import org.apache.log4j.Logger; public abstract class PlayerImpl implements Player, Serializable { - private static final transient Logger logger = Logger.getLogger(PlayerImpl.class); + private static final Logger logger = Logger.getLogger(PlayerImpl.class); private static Random rnd = new Random(); diff --git a/Mage/src/mage/util/Logging.java b/Mage/src/mage/util/Logging.java deleted file mode 100644 index 96441fce6e9..00000000000 --- a/Mage/src/mage/util/Logging.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * 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.util; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.logging.ConsoleHandler; -import java.util.logging.Formatter; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class Logging { - - public static Logger getLogger(String name) { - Logger logger = Logger.getLogger(name); - ConsoleHandler handler = new ConsoleHandler(); - handler.setFormatter(new LogFormatter()); - logger.addHandler(handler); - logger.setUseParentHandlers(false); - return logger; - } - - public static Level getLevel(Logger logger) { - Level level = logger.getLevel(); - while (level == null && logger.getParent() != null) { - logger = logger.getParent(); - level = logger.getLevel(); - } - return level; - } -} - -class LogFormatter extends Formatter { - - private static final DateFormat df = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss.SSS"); - - @Override - public String format(LogRecord record) { - StringBuilder builder = new StringBuilder(1000); - builder.append(df.format(new Date(record.getMillis()))).append(" - "); - builder.append("[").append(record.getSourceClassName()).append("."); - builder.append(record.getSourceMethodName()).append("] - "); - builder.append("[").append(record.getLevel()).append("] - "); - builder.append(formatMessage(record)); - if (record.getThrown() != null) { - try { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - record.getThrown().printStackTrace(pw); - pw.close(); - builder.append(sw.toString()); - } catch (Exception ex) { - } - } - builder.append("\n"); - return builder.toString(); - } - - @Override - public String getHead(Handler h) { - return super.getHead(h); - } - - @Override - public String getTail(Handler h) { - return super.getTail(h); - } - -} \ No newline at end of file