--- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java Fri Jan 20 07:05:40 2017 -0800
+++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/ClassLogger.java Fri Jan 20 18:41:12 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,222 +25,188 @@
package com.sun.jmx.remote.util;
-import java.util.logging.Logger;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.ResourceBundle;
-public class ClassLogger {
+public class ClassLogger implements System.Logger {
- private static final boolean ok;
private final String className;
private final Logger logger;
- static {
- /* We attempt to work even if we are running in J2SE 1.3, where
- there is no java.util.logging. The technique we use here is
- not strictly portable, but it does work with Sun's J2SE 1.3
- at least. This is just a best effort: the Right Thing is for
- people to use at least J2SE 1.4. */
- boolean loaded = false;
- try {
- Class<?> c = java.util.logging.Logger.class;
- loaded = true;
- } catch (Error e) {
- // OK.
- // java.util.logger package is not available in this jvm.
- }
- ok = loaded;
- }
-
public ClassLogger(String subsystem, String className) {
- if (ok)
- logger = Logger.getLogger(subsystem);
- else
- logger = null;
+ logger = System.getLogger(subsystem);
this.className = className;
}
public final boolean traceOn() {
- return finerOn();
+ return logger.isLoggable(Level.TRACE);
}
public final boolean debugOn() {
- return finestOn();
+ return logger.isLoggable(Level.DEBUG);
}
public final boolean warningOn() {
- return ok && logger.isLoggable(java.util.logging.Level.WARNING);
+ return logger.isLoggable(Level.WARNING);
}
public final boolean infoOn() {
- return ok && logger.isLoggable(java.util.logging.Level.INFO);
+ return logger.isLoggable(Level.INFO);
}
public final boolean configOn() {
- return ok && logger.isLoggable(java.util.logging.Level.CONFIG);
+ return logger.isLoggable(Level.DEBUG);
}
public final boolean fineOn() {
- return ok && logger.isLoggable(java.util.logging.Level.FINE);
+ return logger.isLoggable(Level.DEBUG);
}
public final boolean finerOn() {
- return ok && logger.isLoggable(java.util.logging.Level.FINER);
+ return logger.isLoggable(Level.TRACE);
}
public final boolean finestOn() {
- return ok && logger.isLoggable(java.util.logging.Level.FINEST);
+ return logger.isLoggable(Level.TRACE);
}
public final void debug(String func, String msg) {
- finest(func,msg);
+ logger.log(Level.DEBUG, msg);
}
public final void debug(String func, Throwable t) {
- finest(func,t);
+ logger.log(Level.DEBUG, className + "::" + func, t);
}
public final void debug(String func, String msg, Throwable t) {
- finest(func,msg,t);
+ logger.log(Level.DEBUG, msg, t);
}
public final void trace(String func, String msg) {
- finer(func,msg);
+ logger.log(Level.TRACE, msg);
}
public final void trace(String func, Throwable t) {
- finer(func,t);
+ logger.log(Level.TRACE, className + "::" + func, t);
}
public final void trace(String func, String msg, Throwable t) {
- finer(func,msg,t);
+ logger.log(Level.TRACE, msg, t);
}
public final void error(String func, String msg) {
- severe(func,msg);
+ logger.log(Level.ERROR, msg);
}
public final void error(String func, Throwable t) {
- severe(func,t);
+ logger.log(Level.ERROR, className + "::" + func, t);
}
public final void error(String func, String msg, Throwable t) {
- severe(func,msg,t);
+ logger.log(Level.ERROR, msg, t);
}
public final void finest(String func, String msg) {
- if (ok)
- logger.logp(java.util.logging.Level.FINEST, className, func, msg);
+ logger.log(Level.TRACE, msg);
}
public final void finest(String func, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.FINEST, className, func,
- t.toString(), t);
+ logger.log(Level.TRACE, className + "::" + func, t);
}
public final void finest(String func, String msg, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.FINEST, className, func, msg,
- t);
+ logger.log(Level.TRACE, msg, t);
}
public final void finer(String func, String msg) {
- if (ok)
- logger.logp(java.util.logging.Level.FINER, className, func, msg);
+ logger.log(Level.TRACE, msg);
}
public final void finer(String func, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.FINER, className, func,
- t.toString(), t);
+ logger.log(Level.TRACE, className + "::" + func, t);
}
public final void finer(String func, String msg, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.FINER, className, func, msg,t);
+ logger.log(Level.DEBUG, msg, t);
}
public final void fine(String func, String msg) {
- if (ok)
- logger.logp(java.util.logging.Level.FINE, className, func, msg);
+ logger.log(Level.DEBUG, msg);
}
public final void fine(String func, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.FINE, className, func,
- t.toString(), t);
+ logger.log(Level.DEBUG, className + "::" + func, t);
}
public final void fine(String func, String msg, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.FINE, className, func, msg,
- t);
+ logger.log(Level.DEBUG, msg, t);
}
public final void config(String func, String msg) {
- if (ok)
- logger.logp(java.util.logging.Level.CONFIG, className, func, msg);
+ logger.log(Level.DEBUG, msg);
}
public final void config(String func, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.CONFIG, className, func,
- t.toString(), t);
+ logger.log(Level.DEBUG, className + "::" + func, t);
}
public final void config(String func, String msg, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.CONFIG, className, func, msg,
- t);
+ logger.log(Level.DEBUG, msg, t);
}
public final void info(String func, String msg) {
- if (ok)
- logger.logp(java.util.logging.Level.INFO, className, func, msg);
+ logger.log(Level.INFO, msg);
}
public final void info(String func, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.INFO, className, func,
- t.toString(), t);
+ logger.log(Level.INFO, className + "::" + func, t);
}
public final void info(String func, String msg, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.INFO, className, func, msg,
- t);
+ logger.log(Level.INFO, msg, t);
}
public final void warning(String func, String msg) {
- if (ok)
- logger.logp(java.util.logging.Level.WARNING, className, func, msg);
+ logger.log(Level.WARNING, msg);
}
public final void warning(String func, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.WARNING, className, func,
- t.toString(), t);
+ logger.log(Level.WARNING, className + "::" + func, t);
}
public final void warning(String func, String msg, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.WARNING, className, func, msg,
- t);
+ logger.log(Level.WARNING, msg, t);
}
public final void severe(String func, String msg) {
- if (ok)
- logger.logp(java.util.logging.Level.SEVERE, className, func, msg);
+ logger.log(Level.ERROR, msg);
}
public final void severe(String func, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.SEVERE, className, func,
- t.toString(), t);
+ logger.log(Level.ERROR, className + "::" + func, t);
}
public final void severe(String func, String msg, Throwable t) {
- if (ok)
- logger.logp(java.util.logging.Level.SEVERE, className, func, msg,
- t);
+ logger.log(Level.ERROR, msg, t);
+ }
+
+ public final String getName() {
+ return logger.getName();
+ }
+
+ public final boolean isLoggable(Level level) {
+ return logger.isLoggable(level);
}
+
+ public final void log(Level level, ResourceBundle bundle, String msg,
+ Throwable thrown) {
+ logger.log(level, bundle, msg, thrown);
+ }
+
+ public final void log(Level level, ResourceBundle bundle, String format,
+ Object... params) {
+ logger.log(level, bundle, format, params);
+ }
+
}