From 07c5207f879297d7d350747dd21b34e5e207f3c6 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Wed, 5 Oct 2011 15:51:50 -0700
Subject: [PATCH] Get the Log class out of com.threerings. That's too general a
 package to be sticking classes into.

---
 .../servlet/util/FlashVarBuilder.java           |  2 +-
 .../java/com/threerings/servlet/util/Log.java   | 17 +++++++++++++++++
 .../java/com/threerings/{ => util}/Log.java     |  4 ++--
 .../java/com/threerings/util/MessageBundle.java |  5 +++--
 .../com/threerings/util/MessageManager.java     |  2 +-
 .../com/threerings/util/MethodProfiler.java     |  2 +-
 6 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/threerings/servlet/util/Log.java
 rename src/main/java/com/threerings/{ => util}/Log.java (79%)

diff --git a/src/main/java/com/threerings/servlet/util/FlashVarBuilder.java b/src/main/java/com/threerings/servlet/util/FlashVarBuilder.java
index 2a32485..7827bdb 100644
--- a/src/main/java/com/threerings/servlet/util/FlashVarBuilder.java
+++ b/src/main/java/com/threerings/servlet/util/FlashVarBuilder.java
@@ -13,7 +13,7 @@ import com.google.common.collect.Maps;
 
 import com.samskivert.util.Tuple;
 
-import static com.threerings.Log.log;
+import static com.threerings.servlet.util.Log.log;
 
 public class FlashVarBuilder
 {
diff --git a/src/main/java/com/threerings/servlet/util/Log.java b/src/main/java/com/threerings/servlet/util/Log.java
new file mode 100644
index 0000000..e708794
--- /dev/null
+++ b/src/main/java/com/threerings/servlet/util/Log.java
@@ -0,0 +1,17 @@
+//
+// ooo-util - a place for OOO utilities
+// Copyright (C) 2011 Three Rings Design, Inc., All Rights Reserved
+// http://github.com/threerings/ooo-util/blob/master/LICENSE
+
+package com.threerings.servlet.util;
+
+import com.samskivert.util.Logger;
+
+/**
+ * Contains a reference to the log object used by this package.
+ */
+public class Log
+{
+    /** We dispatch our log messages through this logger. */
+    public static Logger log = Logger.getLogger("ooo-servlet-util");
+}
diff --git a/src/main/java/com/threerings/Log.java b/src/main/java/com/threerings/util/Log.java
similarity index 79%
rename from src/main/java/com/threerings/Log.java
rename to src/main/java/com/threerings/util/Log.java
index e12f1c0..83ea93c 100644
--- a/src/main/java/com/threerings/Log.java
+++ b/src/main/java/com/threerings/util/Log.java
@@ -3,12 +3,12 @@
 // Copyright (C) 2011 Three Rings Design, Inc., All Rights Reserved
 // http://github.com/threerings/ooo-util/blob/master/LICENSE
 
-package com.threerings;
+package com.threerings.util;
 
 import com.samskivert.util.Logger;
 
 /**
- * Contains a reference to the log object used by this library.
+ * Contains a reference to the log object used by this package.
  */
 public class Log
 {
diff --git a/src/main/java/com/threerings/util/MessageBundle.java b/src/main/java/com/threerings/util/MessageBundle.java
index 4ab70c5..d98ada5 100644
--- a/src/main/java/com/threerings/util/MessageBundle.java
+++ b/src/main/java/com/threerings/util/MessageBundle.java
@@ -14,7 +14,7 @@ import java.util.ResourceBundle;
 import com.samskivert.text.MessageUtil;
 import com.samskivert.util.StringUtil;
 
-import static com.threerings.Log.log;
+import static com.threerings.util.Log.log;
 
 /**
  * A message bundle provides an easy mechanism by which to obtain translated message strings from
@@ -240,7 +240,8 @@ public class MessageBundle
         }
 
         if (reportMissing) {
-            log.warning("Missing translation message", "bundle", _path, "key", key, new Exception());
+            log.warning("Missing translation message",
+                        "bundle", _path, "key", key, new Exception());
         }
 
         return null;
diff --git a/src/main/java/com/threerings/util/MessageManager.java b/src/main/java/com/threerings/util/MessageManager.java
index 6433bc0..c73d850 100644
--- a/src/main/java/com/threerings/util/MessageManager.java
+++ b/src/main/java/com/threerings/util/MessageManager.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Maps;
 
 import com.samskivert.util.StringUtil;
 
-import static com.threerings.Log.log;
+import static com.threerings.util.Log.log;
 
 /**
  * The message manager provides a thin wrapper around Java's built-in localization support,
diff --git a/src/main/java/com/threerings/util/MethodProfiler.java b/src/main/java/com/threerings/util/MethodProfiler.java
index 8147490..4a9275a 100644
--- a/src/main/java/com/threerings/util/MethodProfiler.java
+++ b/src/main/java/com/threerings/util/MethodProfiler.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Maps;
 
 import com.samskivert.util.StringUtil;
 
-import static com.threerings.Log.log;
+import static com.threerings.util.Log.log;
 
 /**
  * Records the times that it takes to call methods. Allows one simultaneous method call per thread