From: Taq <ta...@us...> - 2006-05-18 20:05:57
|
Update of /cvsroot/jfreechart/jcommon-logger/source/org/jfree/logger/jcl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31384/source/org/jfree/logger/jcl Modified Files: JakartaLogTarget.java Log Message: Logger was invalidly implemented. Seriously, I cant write boolean expressions anymore. Index: JakartaLogTarget.java =================================================================== RCS file: /cvsroot/jfreechart/jcommon-logger/source/org/jfree/logger/jcl/JakartaLogTarget.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JakartaLogTarget.java 15 May 2006 12:10:22 -0000 1.2 --- JakartaLogTarget.java 18 May 2006 20:05:51 -0000 1.3 *************** *** 36,43 **** package org.jfree.logger.jcl; - import org.jfree.util.LogTarget; - import org.jfree.JCommon; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** --- 36,43 ---- package org.jfree.logger.jcl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.jfree.JCommon; + import org.jfree.util.LogTarget; /** *************** *** 50,54 **** private Log logger; ! public JakartaLogTarget () { logger = LogFactory.getLog(JCommon.class); --- 50,54 ---- private Log logger; ! public JakartaLogTarget() { logger = LogFactory.getLog(JCommon.class); *************** *** 56,94 **** /** ! * Logs a message to the main log stream. All attached log targets will also receive ! * this message. If the given log-level is higher than the given debug-level in the main ! * config file, no logging will be done. * * @param level log level of the message. * @param message text to be logged. */ ! public void log (final int level, final Object message) { if (level == LogTarget.DEBUG) { ! logger.debug(message); } else if (level == LogTarget.INFO) { ! logger.info(message); } else if (level == LogTarget.WARN) { ! logger.warn(message); } else if (level == LogTarget.ERROR) { ! logger.error(message); } else { ! logger.fatal(message); } } /** ! * Logs a message to the main log stream. All attached logTargets will also receive this ! * message. If the given log-level is higher than the given debug-level in the main ! * config file, no logging will be done. * <p/> * The exception's stacktrace will be appended to the log-stream --- 56,109 ---- /** ! * Logs a message to the main log stream. All attached log targets will also ! * receive this message. If the given log-level is higher than the given ! * debug-level in the main config file, no logging will be done. * * @param level log level of the message. * @param message text to be logged. */ ! public void log(final int level, final Object message) { if (level == LogTarget.DEBUG) { ! if (logger.isDebugEnabled()) ! { ! logger.debug(message); ! } } else if (level == LogTarget.INFO) { ! if (logger.isInfoEnabled()) ! { ! logger.info(message); ! } } else if (level == LogTarget.WARN) { ! if (logger.isWarnEnabled()) ! { ! logger.warn(message); ! } } else if (level == LogTarget.ERROR) { ! if (logger.isErrorEnabled()) ! { ! logger.error(message); ! } } else { ! if (logger.isFatalEnabled()) ! { ! logger.fatal(message); ! } } } /** ! * Logs a message to the main log stream. All attached logTargets will also ! * receive this message. If the given log-level is higher than the given ! * debug-level in the main config file, no logging will be done. * <p/> * The exception's stacktrace will be appended to the log-stream *************** *** 98,122 **** * @param e the exception, which should be logged. */ ! public void log (final int level, final Object message, final Exception e) { if (level == LogTarget.DEBUG) { ! logger.debug(message, e); } else if (level == LogTarget.INFO) { ! logger.info(message, e); } else if (level == LogTarget.WARN) { ! logger.warn(message, e); } else if (level == LogTarget.ERROR) { ! logger.error(message, e); } else { ! logger.fatal(message, e); } } --- 113,152 ---- * @param e the exception, which should be logged. */ ! public void log(final int level, final Object message, final Exception e) { if (level == LogTarget.DEBUG) { ! if (logger.isDebugEnabled()) ! { ! logger.debug(message, e); ! } } else if (level == LogTarget.INFO) { ! if (logger.isInfoEnabled()) ! { ! logger.info(message, e); ! } } else if (level == LogTarget.WARN) { ! if (logger.isWarnEnabled()) ! { ! logger.warn(message, e); ! } } else if (level == LogTarget.ERROR) { ! if (logger.isErrorEnabled()) ! { ! logger.error(message, e); ! } } else { ! if (logger.isFatalEnabled()) ! { ! logger.fatal(message, e); ! } } } |