X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Flog%2Flog4j%2FLoggerImpl.java;fp=source%2Fmir%2Flog%2Flog4j%2FLoggerImpl.java;h=6f3b5add2ffe6e0303997786be03f60cceba63db;hb=c9ac8fa71b679f8d967aac901bbef945c13b94c9;hp=cd80fd8374a30ac5bcf92f1fdb2ff3ff996a642d;hpb=d63595f89aaa4b6a524dc0b4af9e0eef888f4c6b;p=mir.git diff --git a/source/mir/log/log4j/LoggerImpl.java b/source/mir/log/log4j/LoggerImpl.java index cd80fd83..6f3b5add 100755 --- a/source/mir/log/log4j/LoggerImpl.java +++ b/source/mir/log/log4j/LoggerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2002 The Mir-coders group + * Copyright (C) 2005 The Mir-coders group * * This file is part of Mir. * @@ -18,12 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * In addition, as a special exception, The Mir-coders gives permission to link - * the code of this program with any library licensed under the Apache Software License, - * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library - * (or with modified versions of the above that use the same license as the above), - * and distribute linked combinations including the two. You must obey the - * GNU General Public License in all respects for all of the code used other than - * the above mentioned libraries. If you modify this file, you may extend this + * the code of this program with any library licensed under the Apache Software License. + * You must obey the GNU General Public License in all respects for all of the code used + * other than the above mentioned libraries. If you modify this file, you may extend this * exception to your version of the file, but you are not obligated to do so. * If you do not wish to do so, delete this exception statement from your version. */ @@ -35,12 +32,13 @@ import java.util.Map; import mir.config.MirPropertiesConfiguration; import mir.log.LoggerExc; import mir.log.LoggerFailure; + import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; public class LoggerImpl implements mir.log.Logger { - private static Map loggers = new HashMap(); + private static final Map loggers = new HashMap(); public LoggerImpl() throws LoggerExc { reload(); @@ -62,11 +60,21 @@ public class LoggerImpl implements mir.log.Logger { } /** {@inheritDoc} */ + public void warn(Object o, String s, Throwable anException) { + this.getLogger(o).warn(s, anException); + } + + /** {@inheritDoc} */ public void error(Object o, String s) { this.getLogger(o).error(s); } /** {@inheritDoc} */ + public void error(Object o, String s, Throwable anException) { + this.getLogger(o).error(s, anException); + } + + /** {@inheritDoc} */ public void fatal(Object o, String s) { this.getLogger(o).fatal(s); }