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 ce...@apache.org on 2004/09/16 21:18:59 UTC
cvs commit: logging-log4j/src/java/org/apache/log4j/pattern DatePatternConverter.java LineSeparatorPatternConverter.java LineLocationPatternConverter.java MessagePatternConverter.java RelativeTimePatternConverter.java PatternConverter.java MethodLocationPatternConverter.java FileLocationPatternConverter.java NDCPatternConverter.java FullLocationPatternConverter.java LoggerPatternConverter.java LiteralPatternConverter.java PropertiesPatternConverter.java ClassNamePatternConverter.java LevelPatternConverter.java
ceki 2004/09/16 12:18:58
Modified: src/java/org/apache/log4j/pattern DatePatternConverter.java
LineSeparatorPatternConverter.java
LineLocationPatternConverter.java
MessagePatternConverter.java
RelativeTimePatternConverter.java
PatternConverter.java
MethodLocationPatternConverter.java
FileLocationPatternConverter.java
NDCPatternConverter.java
FullLocationPatternConverter.java
LoggerPatternConverter.java
LiteralPatternConverter.java
PropertiesPatternConverter.java
ClassNamePatternConverter.java
LevelPatternConverter.java
Log:
- Added a getStyleClass() method to PatternConverter and derived classes.
- Added a ignoresThrowable() method to PatternConverter which returns true by default.
Revision Changes Path
1.6 +4 -2 logging-log4j/src/java/org/apache/log4j/pattern/DatePatternConverter.java
Index: DatePatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/DatePatternConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatePatternConverter.java 28 May 2004 16:28:56 -0000 1.5
+++ DatePatternConverter.java 16 Sep 2004 19:18:58 -0000 1.6
@@ -77,9 +77,11 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Date";
}
+ public String getStyleClass(LoggingEvent e) {
+ return "date";
+ }
}
1.4 +4 -2 logging-log4j/src/java/org/apache/log4j/pattern/LineSeparatorPatternConverter.java
Index: LineSeparatorPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/LineSeparatorPatternConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LineSeparatorPatternConverter.java 28 May 2004 16:28:56 -0000 1.3
+++ LineSeparatorPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.4
@@ -39,9 +39,11 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Line Sep";
}
+ public String getStyleClass(LoggingEvent e) {
+ return "lineSep";
+ }
}
1.7 +4 -2 logging-log4j/src/java/org/apache/log4j/pattern/LineLocationPatternConverter.java
Index: LineLocationPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/LineLocationPatternConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LineLocationPatternConverter.java 7 Sep 2004 17:16:04 -0000 1.6
+++ LineLocationPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.7
@@ -47,9 +47,11 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Line";
}
+ public String getStyleClass(LoggingEvent e) {
+ return "line";
+ }
}
1.5 +4 -2 logging-log4j/src/java/org/apache/log4j/pattern/MessagePatternConverter.java
Index: MessagePatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/MessagePatternConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MessagePatternConverter.java 28 May 2004 16:28:56 -0000 1.4
+++ MessagePatternConverter.java 16 Sep 2004 19:18:58 -0000 1.5
@@ -51,9 +51,11 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Message";
}
+ public String getStyleClass(LoggingEvent e) {
+ return "message";
+ }
}
1.6 +5 -2 logging-log4j/src/java/org/apache/log4j/pattern/RelativeTimePatternConverter.java
Index: RelativeTimePatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/RelativeTimePatternConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RelativeTimePatternConverter.java 28 May 2004 16:28:56 -0000 1.5
+++ RelativeTimePatternConverter.java 16 Sep 2004 19:18:58 -0000 1.6
@@ -41,9 +41,12 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Time";
+ }
+
+ public String getStyleClass(LoggingEvent e) {
+ return "time";
}
}
1.7 +24 -0 logging-log4j/src/java/org/apache/log4j/pattern/PatternConverter.java
Index: PatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/PatternConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PatternConverter.java 28 May 2004 16:28:56 -0000 1.6
+++ PatternConverter.java 16 Sep 2004 19:18:58 -0000 1.7
@@ -137,4 +137,28 @@
* @return the name of the conversion pattern
*/
public abstract String getName();
+
+ /**
+ * This method returns the CSS style class that should be applied to
+ * the LoggingEvent passed as parameter.
+ *
+ * This information is currently used only by HTMLLayout.
+ *
+ * @return the name of the conversion pattern
+ */
+ public abstract String getStyleClass(LoggingEvent e);
+
+ /**
+ * Normally pattern converters are now meant to handle Exceptions although
+ * few pattern converters might.
+ *
+ * By examining the return values for this methd, the containing layouy will
+ * determine whether it ignores throwables or not.
+
+ * @return false if this object handles throwables
+ */
+ public boolean ignoresThrowable() {
+ return true;
+ }
+
}
1.7 +5 -2 logging-log4j/src/java/org/apache/log4j/pattern/MethodLocationPatternConverter.java
Index: MethodLocationPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/MethodLocationPatternConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MethodLocationPatternConverter.java 7 Sep 2004 17:16:04 -0000 1.6
+++ MethodLocationPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.7
@@ -47,9 +47,12 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Method";
+ }
+
+ public String getStyleClass(LoggingEvent e) {
+ return "method";
}
}
1.7 +5 -2 logging-log4j/src/java/org/apache/log4j/pattern/FileLocationPatternConverter.java
Index: FileLocationPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/FileLocationPatternConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileLocationPatternConverter.java 7 Sep 2004 17:16:04 -0000 1.6
+++ FileLocationPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.7
@@ -47,9 +47,12 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "File Location";
+ }
+
+ public String getStyleClass(LoggingEvent e) {
+ return "file";
}
}
1.5 +5 -2 logging-log4j/src/java/org/apache/log4j/pattern/NDCPatternConverter.java
Index: NDCPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/NDCPatternConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NDCPatternConverter.java 28 May 2004 16:28:56 -0000 1.4
+++ NDCPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.5
@@ -41,9 +41,12 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "NDC";
+ }
+
+ public String getStyleClass(LoggingEvent e) {
+ return "ndc";
}
}
1.7 +4 -2 logging-log4j/src/java/org/apache/log4j/pattern/FullLocationPatternConverter.java
Index: FullLocationPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/FullLocationPatternConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FullLocationPatternConverter.java 7 Sep 2004 17:16:04 -0000 1.6
+++ FullLocationPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.7
@@ -47,9 +47,11 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Full Location";
}
+ public String getStyleClass(LoggingEvent e) {
+ return "fullLocation";
+ }
}
1.5 +5 -2 logging-log4j/src/java/org/apache/log4j/pattern/LoggerPatternConverter.java
Index: LoggerPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/LoggerPatternConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggerPatternConverter.java 28 May 2004 16:28:56 -0000 1.4
+++ LoggerPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.5
@@ -36,9 +36,12 @@
return event.getLoggerName();
}
- public String getName()
- {
+ public String getName() {
return "Logger";
+ }
+
+ public String getStyleClass(LoggingEvent e) {
+ return "logger";
}
}
1.4 +4 -2 logging-log4j/src/java/org/apache/log4j/pattern/LiteralPatternConverter.java
Index: LiteralPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/LiteralPatternConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LiteralPatternConverter.java 28 May 2004 16:28:56 -0000 1.3
+++ LiteralPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.4
@@ -36,9 +36,11 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Literal";
+ }
+ public String getStyleClass(LoggingEvent e) {
+ return "literal";
}
}
1.8 +5 -0 logging-log4j/src/java/org/apache/log4j/pattern/PropertiesPatternConverter.java
Index: PropertiesPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/PropertiesPatternConverter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropertiesPatternConverter.java 28 May 2004 16:39:52 -0000 1.7
+++ PropertiesPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.8
@@ -78,4 +78,9 @@
}
return name;
}
+
+ public String getStyleClass(LoggingEvent e) {
+ return "property";
+ }
+
}
1.8 +8 -3 logging-log4j/src/java/org/apache/log4j/pattern/ClassNamePatternConverter.java
Index: ClassNamePatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/ClassNamePatternConverter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClassNamePatternConverter.java 28 May 2004 16:28:56 -0000 1.7
+++ ClassNamePatternConverter.java 16 Sep 2004 19:18:58 -0000 1.8
@@ -27,6 +27,9 @@
* @author Ceki Gülcü
*/
public class ClassNamePatternConverter extends NamedPatternConverter {
+ static private final String NAME = "Class Name";
+ static private final String STYLE_CLASS = NAME.toLowerCase();
+
public ClassNamePatternConverter() {
super();
}
@@ -35,9 +38,11 @@
return event.getLocationInformation()!=null?event.getLocationInformation().getClassName():"";
}
- public String getName()
- {
- return "Class Name";
+ public String getName() {
+ return NAME;
}
+ public String getStyleClass(LoggingEvent e) {
+ return STYLE_CLASS;
+ }
}
1.5 +5 -2 logging-log4j/src/java/org/apache/log4j/pattern/LevelPatternConverter.java
Index: LevelPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/LevelPatternConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LevelPatternConverter.java 28 May 2004 16:28:56 -0000 1.4
+++ LevelPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.5
@@ -41,9 +41,12 @@
return buf;
}
- public String getName()
- {
+ public String getName() {
return "Level";
+ }
+
+ public String getStyleClass(LoggingEvent e) {
+ return e.getLevel().toString();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org