From 3c1255da0c61d845f79939153d8ddbc47735359c Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Sun, 20 Feb 2011 02:24:47 +0000
Subject: [PATCH] Added Server.getLogger, changed a few anonymous loggers to
 use it

---
 src/main/java/org/bukkit/Server.java                     | 8 ++++++++
 src/main/java/org/bukkit/fillr/Getter.java               | 7 +++----
 src/main/java/org/bukkit/fillr/Updater.java              | 5 ++---
 src/main/java/org/bukkit/plugin/SimplePluginManager.java | 6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c0a4ed72..7e3ed672 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -3,6 +3,7 @@ package org.bukkit;
 
 import org.bukkit.entity.Player;
 import java.util.List;
+import java.util.logging.Logger;
 
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
@@ -113,4 +114,11 @@ public interface Server {
      * Reloads the server, refreshing settings and plugin information
      */
     public void reload();
+
+    /**
+     * Returns the primary logger associated with this server instance
+     *
+     * @return Logger associated with this server
+     */
+    public Logger getLogger();
 }
diff --git a/src/main/java/org/bukkit/fillr/Getter.java b/src/main/java/org/bukkit/fillr/Getter.java
index 63a1f4cd..8e1b35ad 100644
--- a/src/main/java/org/bukkit/fillr/Getter.java
+++ b/src/main/java/org/bukkit/fillr/Getter.java
@@ -3,7 +3,6 @@ package org.bukkit.fillr;
 import org.bukkit.entity.Player;
 import java.io.File;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.bukkit.*;
 import org.bukkit.plugin.InvalidDescriptionException;
@@ -30,7 +29,7 @@ public class Getter {
             enablePlugin(reader);
             player.sendMessage("Loading " + reader.getName());
         } catch (Exception ex) {
-            Logger.getLogger(Getter.class.getName()).log(Level.SEVERE, null, ex);
+            server.getLogger().log(Level.SEVERE, null, ex);
         }
     }
 
@@ -41,9 +40,9 @@ public class Getter {
         try {
             server.getPluginManager().loadPlugin(plugin);
         } catch (InvalidPluginException ex) {
-            Logger.getLogger(Getter.class.getName()).log(Level.SEVERE, null, ex);
+            server.getLogger().log(Level.SEVERE, null, ex);
         } catch (InvalidDescriptionException ex) {
-            Logger.getLogger(Getter.class.getName()).log(Level.SEVERE, null, ex);
+            server.getLogger().log(Level.SEVERE, null, ex);
         }
     }
 }
diff --git a/src/main/java/org/bukkit/fillr/Updater.java b/src/main/java/org/bukkit/fillr/Updater.java
index a7832952..61d62fd2 100644
--- a/src/main/java/org/bukkit/fillr/Updater.java
+++ b/src/main/java/org/bukkit/fillr/Updater.java
@@ -6,7 +6,6 @@ import org.bukkit.plugin.*;
 
 import java.io.File;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class Updater {
     public static String DIRECTORY = Fillr.DIRECTORY;
@@ -99,9 +98,9 @@ public class Updater {
         try {
             server.getPluginManager().loadPlugin(plugin);
         } catch (InvalidPluginException ex) {
-            Logger.getLogger(Getter.class.getName()).log(Level.SEVERE, null, ex);
+            server.getLogger().log(Level.SEVERE, null, ex);
         } catch (InvalidDescriptionException ex) {
-            Logger.getLogger(Getter.class.getName()).log(Level.SEVERE, null, ex);
+            server.getLogger().log(Level.SEVERE, null, ex);
         }
     }
 
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 5b35e81e..74200b5c 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -93,9 +93,9 @@ public final class SimplePluginManager implements PluginManager {
             try {
                 plugin = loadPlugin(file);
             } catch (InvalidPluginException ex) {
-                Logger.getLogger(SimplePluginManager.class.getName()).log(Level.SEVERE, "Could not load " + file.getPath() + " in " + directory.getPath() + ": " + ex.getMessage(), ex);
+                server.getLogger().log(Level.SEVERE, "Could not load " + file.getPath() + " in " + directory.getPath() + ": " + ex.getMessage(), ex);
             } catch (InvalidDescriptionException ex) {
-                Logger.getLogger(SimplePluginManager.class.getName()).log(Level.SEVERE, "Could not load " + file.getPath() + " in " + directory.getPath() + ": " + ex.getMessage(), ex);
+                server.getLogger().log(Level.SEVERE, "Could not load " + file.getPath() + " in " + directory.getPath() + ": " + ex.getMessage(), ex);
             }
 
             if (plugin != null) {
@@ -224,7 +224,7 @@ public final class SimplePluginManager implements PluginManager {
                 try {
                     registration.callEvent( event );
                 } catch (Throwable ex) {
-                    Logger.getLogger(SimplePluginManager.class.getName()).log(Level.SEVERE, "Could not pass event " + event.getType() + " to " + registration.getPlugin().getDescription().getName(), ex);
+                    server.getLogger().log(Level.SEVERE, "Could not pass event " + event.getType() + " to " + registration.getPlugin().getDescription().getName(), ex);
                 }
             }
         }