From 427b97433e14079fc9466457b19cc70ac49e6670 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 7 Dec 2013 20:03:05 +0000 Subject: Logger cleanup pt 1. --- .../src/com/earth2me/essentials/AlternativeCommandsHandler.java | 2 +- Essentials/src/com/earth2me/essentials/Backup.java | 2 +- Essentials/src/com/earth2me/essentials/Essentials.java | 3 ++- Essentials/src/com/earth2me/essentials/EssentialsConf.java | 2 +- .../src/com/earth2me/essentials/EssentialsEntityListener.java | 2 +- .../src/com/earth2me/essentials/EssentialsPlayerListener.java | 2 +- Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java | 2 +- Essentials/src/com/earth2me/essentials/I18n.java | 4 ++-- Essentials/src/com/earth2me/essentials/Mob.java | 2 +- Essentials/src/com/earth2me/essentials/MobData.java | 2 +- Essentials/src/com/earth2me/essentials/Settings.java | 2 +- Essentials/src/com/earth2me/essentials/Trade.java | 6 +++--- Essentials/src/com/earth2me/essentials/User.java | 2 +- Essentials/src/com/earth2me/essentials/Warps.java | 2 +- Essentials/src/com/earth2me/essentials/Worth.java | 2 +- Essentials/src/com/earth2me/essentials/api/Economy.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandsudo.java | 2 +- .../src/com/earth2me/essentials/commands/EssentialsCommand.java | 2 +- Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java | 2 +- Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java | 2 +- Essentials/src/com/earth2me/essentials/textreader/HelpInput.java | 2 +- Essentials/src/plugin.yml | 2 +- 22 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java index ec105e315..3016ffe59 100644 --- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java +++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java @@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin; public class AlternativeCommandsHandler { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static final Logger LOGGER = Logger.getLogger("Essentials"); private final transient Map> altcommands = new HashMap>(); private final transient Map disabledList = new HashMap(); private final transient IEssentials ess; diff --git a/Essentials/src/com/earth2me/essentials/Backup.java b/Essentials/src/com/earth2me/essentials/Backup.java index ad5c4e729..2e754d0f2 100644 --- a/Essentials/src/com/earth2me/essentials/Backup.java +++ b/Essentials/src/com/earth2me/essentials/Backup.java @@ -13,7 +13,7 @@ import org.bukkit.command.CommandSender; public class Backup implements Runnable { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static final Logger LOGGER = Logger.getLogger("Essentials"); private transient final Server server; private transient final IEssentials ess; private transient boolean running = false; diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index c7bf6c307..d932e65f7 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -82,7 +82,7 @@ import org.yaml.snakeyaml.error.YAMLException; public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { public static final int BUKKIT_VERSION = 2882; - private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static final Logger LOGGER = Logger.getLogger("Essentials"); private transient ISettings settings; private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this); private transient Jails jails; @@ -136,6 +136,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { try { + LOGGER.setParent(this.getLogger()); execTimer = new ExecuteTimer(); execTimer.start(); i18n = new I18n(this); diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index 8a2782a8e..0dcf53218 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -31,7 +31,7 @@ import org.bukkit.util.Vector; public class EssentialsConf extends YamlConfiguration { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static final Logger LOGGER = Logger.getLogger("Essentials"); private final File configFile; private String templateName = null; private Class resourceClass = EssentialsConf.class; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index e87cb3ead..7ef9f971f 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -18,7 +18,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsEntityListener implements Listener { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static final Logger LOGGER = Logger.getLogger("Essentials"); private static final transient Pattern powertoolPlayer = Pattern.compile("\\{player\\}"); private final IEssentials ess; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 8c3303032..60be7e239 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -35,7 +35,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsPlayerListener implements Listener { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static final Logger LOGGER = Logger.getLogger("Essentials"); private final transient IEssentials ess; public EssentialsPlayerListener(final IEssentials parent) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java index 89237892a..68cb4ec48 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -22,7 +22,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsUpgrade { - private final static Logger LOGGER = Logger.getLogger("Minecraft"); + private final static Logger LOGGER = Logger.getLogger("Essentials"); private final transient IEssentials ess; private final transient EssentialsConf doneFile; diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/com/earth2me/essentials/I18n.java index c936bfcea..760b9e2f9 100644 --- a/Essentials/src/com/earth2me/essentials/I18n.java +++ b/Essentials/src/com/earth2me/essentials/I18n.java @@ -66,7 +66,7 @@ public class I18n implements net.ess3.api.II18n } catch (MissingResourceException ex) { - Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex); + Logger.getLogger("Essentials").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex); return defaultBundle.getString(string); } } @@ -128,7 +128,7 @@ public class I18n implements net.ess3.api.II18n currentLocale = new Locale(parts[0], parts[1], parts[2]); } ResourceBundle.clearCache(); - Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString())); + Logger.getLogger("Essentials").log(Level.INFO, String.format("Using locale %s", currentLocale.toString())); customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess)); localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale); } diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java index 6dbbc1cc6..2c3201aad 100644 --- a/Essentials/src/com/earth2me/essentials/Mob.java +++ b/Essentials/src/com/earth2me/essentials/Mob.java @@ -53,7 +53,7 @@ public enum Mob MINECART_MOB_SPAWNER("SpawnerMinecart", Enemies.NEUTRAL, EntityType.MINECART_MOB_SPAWNER), ENDERCRYSTAL("EnderCrystal", Enemies.NEUTRAL, EntityType.ENDER_CRYSTAL), EXPERIENCEORB("ExperienceOrb", Enemies.NEUTRAL, EntityType.EXPERIENCE_ORB); - public static final Logger logger = Logger.getLogger("Minecraft"); + public static final Logger logger = Logger.getLogger("Essentials"); private Mob(String n, Enemies en, String s, EntityType type) { diff --git a/Essentials/src/com/earth2me/essentials/MobData.java b/Essentials/src/com/earth2me/essentials/MobData.java index 0ce94c150..65abb76eb 100644 --- a/Essentials/src/com/earth2me/essentials/MobData.java +++ b/Essentials/src/com/earth2me/essentials/MobData.java @@ -126,7 +126,7 @@ public enum MobData EXP, SIZE; } - public static final Logger logger = Logger.getLogger("Minecraft"); + public static final Logger logger = Logger.getLogger("Essentials"); private MobData(String n, Object type, Object value, boolean isPublic) { diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 0f961d7ab..ec9bfd949 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -24,7 +24,7 @@ import org.bukkit.inventory.ItemStack; public class Settings implements net.ess3.api.ISettings { private final transient EssentialsConf config; - private final static Logger logger = Logger.getLogger("Minecraft"); + private final static Logger logger = Logger.getLogger("Essentials"); private final transient IEssentials ess; private boolean metricsEnabled = true; diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index 37d6fdf02..5c59b0e82 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -340,7 +340,7 @@ public class Trade } catch (IOException ex) { - Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex); + Logger.getLogger("Essentials").log(Level.SEVERE, null, ex); } } StringBuilder sb = new StringBuilder(); @@ -428,7 +428,7 @@ public class Trade } catch (IOException ex) { - Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex); + Logger.getLogger("Essentials").log(Level.SEVERE, null, ex); } } @@ -442,7 +442,7 @@ public class Trade } catch (IOException ex) { - Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex); + Logger.getLogger("Essentials").log(Level.SEVERE, null, ex); } fw = null; } diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 1e9c1d677..91394c291 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -25,7 +25,7 @@ import org.bukkit.potion.PotionEffectType; public class User extends UserData implements Comparable, IReplyTo, net.ess3.api.IUser { - private static final Logger logger = Logger.getLogger("Minecraft"); + private static final Logger logger = Logger.getLogger("Essentials"); private CommandSource replyTo = null; private transient String teleportRequester; private transient boolean teleportRequestHere; diff --git a/Essentials/src/com/earth2me/essentials/Warps.java b/Essentials/src/com/earth2me/essentials/Warps.java index 12c2343e6..b993311c2 100644 --- a/Essentials/src/com/earth2me/essentials/Warps.java +++ b/Essentials/src/com/earth2me/essentials/Warps.java @@ -16,7 +16,7 @@ import org.bukkit.Server; public class Warps implements IConf, net.ess3.api.IWarps { - private static final Logger logger = Logger.getLogger("Minecraft"); + private static final Logger logger = Logger.getLogger("Essentials"); private final Map warpPoints = new HashMap(); private final File warpsFolder; private final Server server; diff --git a/Essentials/src/com/earth2me/essentials/Worth.java b/Essentials/src/com/earth2me/essentials/Worth.java index 1f9c9ec84..fe197b1a4 100644 --- a/Essentials/src/com/earth2me/essentials/Worth.java +++ b/Essentials/src/com/earth2me/essentials/Worth.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack; public class Worth implements IConf { - private static final Logger logger = Logger.getLogger("Minecraft"); + private static final Logger logger = Logger.getLogger("Essentials"); private final EssentialsConf config; public Worth(File dataFolder) diff --git a/Essentials/src/com/earth2me/essentials/api/Economy.java b/Essentials/src/com/earth2me/essentials/api/Economy.java index 43a612b84..606661b4d 100644 --- a/Essentials/src/com/earth2me/essentials/api/Economy.java +++ b/Essentials/src/com/earth2me/essentials/api/Economy.java @@ -31,7 +31,7 @@ public class Economy public Economy() { } - private static final Logger logger = Logger.getLogger("Minecraft"); + private static final Logger logger = Logger.getLogger("Essentials"); private static IEssentials ess; private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded."; public static final MathContext MATH_CONTEXT = MathContext.DECIMAL128; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java index 95e1dd280..a5a8f7aab 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java @@ -16,7 +16,7 @@ public class Commandsudo extends EssentialsCommand { super("sudo"); } - private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static final Logger LOGGER = Logger.getLogger("Essentials"); @Override public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java index ccb348a57..e51e392b6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java +++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java @@ -17,7 +17,7 @@ public abstract class EssentialsCommand implements IEssentialsCommand private final transient String name; protected transient IEssentials ess; protected transient IEssentialsModule module; - protected final static Logger logger = Logger.getLogger("Minecraft"); + protected final static Logger logger = Logger.getLogger("Essentials"); protected EssentialsCommand(final String name) { diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java index 03f24bd85..e6a36d46f 100644 --- a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java @@ -14,7 +14,7 @@ public class PermissionsHandler implements IPermissionsHandler private transient IPermissionsHandler handler = new NullPermissionsHandler(); private transient String defaultGroup = "default"; private final transient Plugin plugin; - private final static Logger LOGGER = Logger.getLogger("Minecraft"); + private final static Logger LOGGER = Logger.getLogger("Essentials"); private transient boolean useSuperperms = false; public PermissionsHandler(final Plugin plugin) diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java index ce1412332..c782886cb 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java @@ -17,7 +17,7 @@ import org.bukkit.event.block.*; public class SignBlockListener implements Listener { - private final static Logger LOGGER = Logger.getLogger("Minecraft"); + private final static Logger LOGGER = Logger.getLogger("Essentials"); private final static Material WALL_SIGN = Material.WALL_SIGN; private final static Material SIGN_POST = Material.SIGN_POST; private final transient IEssentials ess; diff --git a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java b/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java index d0f708423..312a43cf3 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java +++ b/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java @@ -16,7 +16,7 @@ public class HelpInput implements IText private static final String DESCRIPTION = "description"; private static final String PERMISSION = "permission"; private static final String PERMISSIONS = "permissions"; - private final static Logger logger = Logger.getLogger("Minecraft"); + private final static Logger logger = Logger.getLogger("Essentials"); private final transient List lines = new ArrayList(); private final transient List chapters = new ArrayList(); private final transient Map bookmarks = new HashMap(); diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 6732a720f..3eb2b6201 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -61,7 +61,7 @@ commands: aliases: [eburn] clearinventory: description: Clear all items in your inventory. - usage: / [player|*] [item[:]|*|**] + usage: / [player|*] [item[:]|*|**] [amount] aliases: [ci,eci,clean,eclean,clear,eclear,clearinvent,eclearinvent,eclearinventory] compass: description: Describes your current bearing. -- cgit v1.2.3