ozeigermann 2004/07/06 00:38:00
Modified: src/wrappers/log4j Log4jLogger.java
Log:
Removed references to deprecated Priority class
Revision Changes Path
1.12 +29 -29 jakarta-slide/src/wrappers/log4j/Log4jLogger.java
Index: Log4jLogger.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/wrappers/log4j/Log4jLogger.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Log4jLogger.java 11 Feb 2004 11:30:45 -0000 1.11
+++ Log4jLogger.java 6 Jul 2004 07:38:00 -0000 1.12
@@ -24,7 +24,7 @@
package log4j;
import org.apache.log4j.Category;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.apache.slide.util.logger.Logger;
/**
@@ -57,9 +57,9 @@
* @param loggerLevel New logger level
*/
public void setLoggerLevel(String channel, int loggerLevel) {
- Priority priority = toPriority(loggerLevel);
+ Level level = toLevel(loggerLevel);
Category cat = getCategory(channel);
- cat.setPriority(priority);
+ cat.setLevel(level);
}
/**
@@ -79,7 +79,7 @@
*/
public int getLoggerLevel(String channel) {
Category cat = getCategory(channel);
- return fromPriority(cat.getPriority());
+ return fromLevel(cat.getLevel());
}
@@ -108,7 +108,7 @@
*/
public void log(Object data, Throwable throwable, String channel, int level) {
Category cat = getCategory(channel);
- cat.log(toPriority(level), data, throwable);
+ cat.log(toLevel(level), data, throwable);
}
@@ -122,9 +122,9 @@
public void log(Object data, String channel, int level) {
Category cat = getCategory(channel);
if (data instanceof Throwable)
- cat.log(toPriority(level), data, (Throwable)data);
+ cat.log(toLevel(level), data, (Throwable)data);
else
- cat.log(toPriority(level), data);
+ cat.log(toLevel(level), data);
}
@@ -160,7 +160,7 @@
public boolean isEnabled(String channel, int level) {
Category cat = getCategory(channel);
- return cat.isEnabledFor(toPriority(level));
+ return cat.isEnabledFor(toLevel(level));
}
@@ -190,57 +190,57 @@
/**
- * Convert Slide priority to log4j priority.
+ * Convert Slide level to log4j level.
*/
- protected Priority toPriority(int priority) {
- Priority result = null;
+ protected Level toLevel(int level) {
+ Level result = null;
- switch (priority) {
+ switch (level) {
case EMERGENCY:
- result = Priority.FATAL;
+ result = Level.FATAL;
break;
case CRITICAL:
- result = Priority.FATAL;
+ result = Level.FATAL;
break;
case ERROR:
- result = Priority.ERROR;
+ result = Level.ERROR;
break;
case WARNING:
- result = Priority.WARN;
+ result = Level.WARN;
break;
case INFO:
- result = Priority.INFO;
+ result = Level.INFO;
break;
case DEBUG:
- result = Priority.DEBUG;
+ result = Level.DEBUG;
break;
}
if (result == null)
- result = Priority.toPriority(priority);
+ result = Level.toLevel(level);
return result;
}
/**
- * Convert Slide priority to log4j priority.
+ * Convert Slide level to log4j level.
*/
- protected int fromPriority(Priority priority) {
+ protected int fromLevel(Level level) {
int result = INFO;
- if (priority.equals(Priority.FATAL)){
+ if (level.equals(Level.FATAL)){
result = EMERGENCY;
}
- else if (priority.equals(Priority.ERROR)){
+ else if (level.equals(Level.ERROR)){
result = ERROR;
}
- else if (priority.equals(Priority.WARN)){
+ else if (level.equals(Level.WARN)){
result = WARNING;
}
- else if (priority.equals(Priority.INFO)){
+ else if (level.equals(Level.INFO)){
result = INFO;
}
- else if (priority.equals(Priority.DEBUG)){
+ else if (level.equals(Level.DEBUG)){
result = DEBUG;
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
