You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by sd...@apache.org on 2003/05/15 20:26:04 UTC
cvs commit: jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw DefaultSortTableModel.java LogUI.java JSortTable.java
sdeboy 2003/05/15 11:26:04
Modified: src/java/org/apache/log4j/xml XMLDecoder.java
UtilLoggingXMLDecoder.java
src/java/org/apache/log4j/chainsaw
DefaultSortTableModel.java LogUI.java
JSortTable.java
Log:
Fixed xml-based recreation of location info (parameter order incorrect), also completed support for java.util.logging event reception, export and import (level support).
Revision Changes Path
1.8 +1 -1 jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/XMLDecoder.java
Index: XMLDecoder.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/XMLDecoder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLDecoder.java 15 May 2003 16:13:37 -0000 1.7
+++ XMLDecoder.java 15 May 2003 18:26:03 -0000 1.8
@@ -376,7 +376,7 @@
new LoggingEvent(
logger.getName(), logger, timeStamp, levelImpl, threadName, message, ndc,
mdc, new ThrowableInformation(exception),
- new LocationInfo(className, methodName, fileName, lineNumber),
+ new LocationInfo(fileName, className, methodName, lineNumber),
properties));
}
1.8 +1 -1 jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
Index: UtilLoggingXMLDecoder.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UtilLoggingXMLDecoder.java 15 May 2003 07:31:02 -0000 1.7
+++ UtilLoggingXMLDecoder.java 15 May 2003 18:26:03 -0000 1.8
@@ -376,7 +376,7 @@
new LoggingEvent(
logger.getName(), logger, timeStamp, level, threadName, message, ndc,
mdc, new ThrowableInformation(exception),
- new LocationInfo(className, methodName, fileName, lineNumber),
+ new LocationInfo(fileName, className, methodName, lineNumber),
properties));
}
1.8 +25 -9 jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/DefaultSortTableModel.java
Index: DefaultSortTableModel.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/DefaultSortTableModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultSortTableModel.java 15 May 2003 07:31:01 -0000 1.7
+++ DefaultSortTableModel.java 15 May 2003 18:26:03 -0000 1.8
@@ -66,6 +66,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.apache.log4j.UtilLoggingLevel;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
@@ -94,26 +95,31 @@
new FilterChangeExecutor();
private EventCountListener listener;
private StringBuffer detail = new StringBuffer();
+ private String eventType;
public DefaultSortTableModel() {
}
- public DefaultSortTableModel(Vector names, int rows) {
+ public DefaultSortTableModel(Vector names, int rows, String eventType) {
super(names, rows);
+ this.eventType = eventType;
allColumnNames = names;
}
- public DefaultSortTableModel(Vector data, Vector names) {
+ public DefaultSortTableModel(Vector data, Vector names, String eventType) {
super(data, names);
+ this.eventType = eventType;
allColumnNames = names;
}
- public DefaultSortTableModel(int rows, int cols) {
+ public DefaultSortTableModel(int rows, int cols, String eventType) {
super(rows, cols);
+ this.eventType = eventType;
}
- public DefaultSortTableModel(Object[][] data, Object[] names) {
+ public DefaultSortTableModel(Object[][] data, Object[] names, String eventType) {
super(data, names);
+ this.eventType = eventType;
allColumnNames = new Vector();
for (int i = 0; i < names.length; i++) {
@@ -121,8 +127,9 @@
}
}
- public DefaultSortTableModel(Object[] names, int rows) {
+ public DefaultSortTableModel(Object[] names, int rows, String eventType) {
super(names, rows);
+ this.eventType = eventType;
allColumnNames = new Vector();
for (int i = 0; i < names.length; i++) {
@@ -350,7 +357,7 @@
//iterate through all column names and set the value from the unfiltered event
long timeStamp = 0L;
Logger logger = null;
- Level level = null;
+ String level = null;
String threadName = "";
Object message = null;
String ndc = "";
@@ -385,7 +392,7 @@
}
if (column.equalsIgnoreCase(ChainsawConstants.LEVEL_COL_NAME)) {
- level = Level.toLevel(value);
+ level = value;
}
if (column.equalsIgnoreCase(ChainsawConstants.THREAD_COL_NAME)) {
@@ -454,10 +461,19 @@
properties.put(ChainsawConstants.LOG4J_ID_KEY, ID.toString());
}
+ Level levelImpl = null;
+ if (eventType != null && eventType.equalsIgnoreCase(ChainsawConstants.UTIL_LOGGING_EVENT_TYPE)) {
+ levelImpl=UtilLoggingLevel.toLevel(level);
+ }
+
+ if (levelImpl==null) {
+ levelImpl=Level.toLevel(level);
+ }
+
return new LoggingEvent(
- logger.getName(), logger, timeStamp, level, threadName, message, ndc, mdc,
+ logger.getName(), logger, timeStamp, levelImpl, threadName, message, ndc, mdc,
new ThrowableInformation(exception),
- new LocationInfo(className, methodName, fileName, lineNumber), properties);
+ new LocationInfo(fileName, className, methodName, lineNumber), properties);
}
public boolean isAddRow(Vector v) {
1.49 +1 -1 jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- LogUI.java 15 May 2003 07:31:01 -0000 1.48
+++ LogUI.java 15 May 2003 18:26:03 -0000 1.49
@@ -617,7 +617,7 @@
table = (JSortTable) tableMap.get(ident);
} else {
tableModel =
- new DefaultSortTableModel(new Vector(), new Vector(columnNames));
+ new DefaultSortTableModel(new Vector(), new Vector(columnNames), eventType);
map = new HashMap();
table = new JSortTable(tableModel);
scrollToBottom = new ScrollToBottom(true);
1.3 +3 -3 jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/JSortTable.java
Index: JSortTable.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/JSortTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSortTable.java 29 Apr 2003 16:21:29 -0000 1.2
+++ JSortTable.java 15 May 2003 18:26:03 -0000 1.3
@@ -75,15 +75,15 @@
}
public JSortTable(int rows, int cols) {
- this(new DefaultSortTableModel(rows, cols));
+ this(new DefaultSortTableModel(rows, cols, null));
}
public JSortTable(Object[][] data, Object[] names) {
- this(new DefaultSortTableModel(data, names));
+ this(new DefaultSortTableModel(data, names, null));
}
public JSortTable(Vector data, Vector names) {
- this(new DefaultSortTableModel(data, names));
+ this(new DefaultSortTableModel(data, names, null));
}
public JSortTable(SortTableModel model) {
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org