From 9d9f8a68c35e15771bd2c1f54f10246b1ff986d0 Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Wed, 23 May 2007 18:37:34 +0000
Subject: [PATCH] Just provide the classname and method when providing log
 message context. Tidied up some other bits.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2106 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../com/samskivert/util/OneLineLogFormatter.java   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/java/com/samskivert/util/OneLineLogFormatter.java b/src/java/com/samskivert/util/OneLineLogFormatter.java
index 69588a21..bf5f5a53 100644
--- a/src/java/com/samskivert/util/OneLineLogFormatter.java
+++ b/src/java/com/samskivert/util/OneLineLogFormatter.java
@@ -72,14 +72,12 @@ public class OneLineLogFormatter extends Formatter
         if (_showWhere) {
             // append the log method call context
             String where = record.getSourceClassName();
-            boolean legacy = (where.indexOf("LoggingLogProvider") != -1);
-            if (where != null && !legacy) {
-                String logger = record.getLoggerName();
-                if (logger != null && where.startsWith(logger) &&
-                    where.length() > logger.length()) {
-                    where = where.substring(logger.length()+1);
-                }
-            } else {
+            if (where != null) {
+                // strip the package name from the logging class
+                where = where.substring(where.lastIndexOf(".")+1);
+            }
+            boolean legacy = where.equals("Log") || where.equals("LoggingLogProvider");
+            if (legacy) {
                 where = record.getLoggerName();
             }
             buf.append(where);