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/12/22 22:56:35 UTC
cvs commit: logging-log4j/src/java/org/apache/log4j/pattern DatePatternConverter.java PatternConverter.java PropertiesPatternConverter.java NamedPatternConverter.java
ceki 2004/12/22 13:56:35
Modified: src/java/org/apache/log4j/pattern DatePatternConverter.java
PatternConverter.java
PropertiesPatternConverter.java
NamedPatternConverter.java
Log:
Simplifications as discussed in log4j-dev
- Remove the setOption method
- Change PatternConverter.setOptions to be implemented as {}, i.e. NOP.
- Change sub-classes of PatternConverter dealing with options override the NOP implementaton in PatternConverter.setOptions.
Revision Changes Path
1.10 +16 -23 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DatePatternConverter.java 22 Dec 2004 20:31:11 -0000 1.9
+++ DatePatternConverter.java 22 Dec 2004 21:56:35 -0000 1.10
@@ -58,49 +58,42 @@
* The option string can be one of the strings 'DATE', 'ABSOLUTE', 'ISO8601'
* or any date and time pattern accepted by java.text.SimpleDateFormat.
*/
- public void setOption(String option) {
- super.setOption(option);
-
+ public void setOptions(List optionList) {
+ if(optionList == null || optionList.size() == 0) {
+ return;
+ }
+
+ String patternOption = (String) optionList.get(0);
String pattern;
- if (option == null) {
+ if (patternOption == null) {
pattern = "yyyy-MM-dd HH:mm:ss,SSS";
} else if (
- option.equalsIgnoreCase(AbsoluteTimeDateFormat.ISO8601_DATE_FORMAT)) {
+ patternOption.equalsIgnoreCase(AbsoluteTimeDateFormat.ISO8601_DATE_FORMAT)) {
pattern = "yyyy-MM-dd HH:mm:ss,SSS";
} else if (
- option.equalsIgnoreCase(AbsoluteTimeDateFormat.ABS_TIME_DATE_FORMAT)) {
+ patternOption.equalsIgnoreCase(AbsoluteTimeDateFormat.ABS_TIME_DATE_FORMAT)) {
pattern = "HH:mm:ss,SSS";
} else if (
- option.equalsIgnoreCase(
+ patternOption.equalsIgnoreCase(
AbsoluteTimeDateFormat.DATE_AND_TIME_DATE_FORMAT)) {
pattern = "dd MMM yyyy HH:mm:ss,SSS";
} else {
- pattern = option;
+ pattern = patternOption;
}
try {
df = new SimpleDateFormat(pattern);
} catch (IllegalArgumentException e) {
logger.warn(
- "Could not instantiate SimpleDateFormat with pattern " + option, e);
+ "Could not instantiate SimpleDateFormat with pattern " + patternOption, e);
// detault for the ISO8601 format
df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS");
}
- }
- /**
- * Sets the date format and timezone.
- * @param options list of options, may be null.
- */
- public void setOptions(List options) {
- if (options == null || options.size() == 0) {
- setOption(null);
- } else {
- setOption((String) options.get(0));
- if (options.size() > 1) {
- TimeZone tz = TimeZone.getTimeZone((String) options.get(1));
- df.setTimeZone(tz);
- }
+ // if the option list contains a TZ option, then set it.
+ if (optionList.size() > 1) {
+ TimeZone tz = TimeZone.getTimeZone((String) optionList.get(1));
+ df.setTimeZone(tz);
}
}
1.15 +2 -14 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PatternConverter.java 22 Dec 2004 20:31:11 -0000 1.14
+++ PatternConverter.java 22 Dec 2004 21:56:35 -0000 1.15
@@ -49,7 +49,7 @@
int min = -1;
int max = 0x7FFFFFFF;
boolean leftAlign = false;
- String option;
+ //String option;
protected PatternConverter() {
}
@@ -121,25 +121,13 @@
}
}
}
-
- public String getOption() {
- return option;
- }
-
- public void setOption(String string) {
- option = string;
- }
/**
* Sets multiple options for the converter.
* @param options list of options, may be null.
- * @remarks added to allow DateFormat to have multiple
- * options, delegates to setOption for other converters.
*/
public void setOptions(List options) {
- if(options != null && options.size() >= 1) {
- setOption((String) options.get(0));
- }
+ // NOP implementation. Most PC's do not deal with options.
}
/**
1.9 +8 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PropertiesPatternConverter.java 16 Sep 2004 19:18:58 -0000 1.8
+++ PropertiesPatternConverter.java 22 Dec 2004 21:56:35 -0000 1.9
@@ -35,6 +35,7 @@
public class PropertiesPatternConverter extends PatternConverter {
String name;
+ String option;
public StringBuffer convert(LoggingEvent event) {
@@ -68,6 +69,13 @@
return buf;
}
+ public void setOptions(List optionList) {
+ if(optionList == null || optionList.size() == 0) {
+ return;
+ }
+ option = (String) optionList.get(0);
+ }
+
public String getName() {
if(name == null) {
if(option != null) {
1.5 +8 -2 logging-log4j/src/java/org/apache/log4j/pattern/NamedPatternConverter.java
Index: NamedPatternConverter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/NamedPatternConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamedPatternConverter.java 20 Nov 2004 11:27:19 -0000 1.4
+++ NamedPatternConverter.java 22 Dec 2004 21:56:35 -0000 1.5
@@ -16,6 +16,8 @@
package org.apache.log4j.pattern;
+import java.util.List;
+
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
@@ -44,8 +46,12 @@
abstract String getFullyQualifiedName(LoggingEvent event);
- public void setOption(String option) {
- super.setOption(option);
+ public void setOptions(List optionList) {
+ if(optionList == null || optionList.size() == 0) {
+ return;
+ }
+
+ String option = (String) optionList.get(0);
/**
The option is expected to be in decimal and positive. In case of
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org