mirror of
https://github.com/magefree/mage.git
synced 2025-12-27 22:12:03 -08:00
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
This commit is contained in:
parent
28a087812a
commit
bfb428b13a
45 changed files with 71 additions and 178 deletions
|
|
@ -44,7 +44,7 @@ import org.apache.log4j.Logger;
|
|||
*/
|
||||
public class MageObjectReference implements Comparable<MageObjectReference>, 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;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ import mage.util.ThreadLocalStringBuilder;
|
|||
|
||||
public class ObjectColor implements Serializable, Copyable<ObjectColor>, Comparable<ObjectColor> {
|
||||
|
||||
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");
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ import mage.util.ThreadLocalStringBuilder;
|
|||
*/
|
||||
public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Abilities<T> {
|
||||
|
||||
private static final transient ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(200);
|
||||
private static final ThreadLocalStringBuilder threadLocalBuilder = new ThreadLocalStringBuilder(200);
|
||||
|
||||
public AbilitiesImpl() {}
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Watcher> emptyWatchers = new ArrayList<>();
|
||||
private static final List<Ability> emptyAbilities = new ArrayList<>();
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ import mage.util.ThreadLocalStringBuilder;
|
|||
*/
|
||||
public class CardsImpl extends LinkedHashSet<UUID> 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;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ import mage.watchers.Watchers;
|
|||
*/
|
||||
public class GameState implements Serializable, Copyable<GameState> {
|
||||
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -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<byte[]> states;
|
||||
private final List<GameState> states;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue