ceki 2002/06/11 06:17:38
Modified: src/java/org/apache/log4j Tag: v1_2-branch
AppenderSkeleton.java FileAppender.java
WriterAppender.java
src/java/org/apache/log4j/spi Tag: v1_2-branch
LoggingEvent.java
src/java/org/apache/log4j/varia Tag: v1_2-branch
LevelRangeFilter.java LevelMatchFilter.java
Log:
Cosmetic changes, documentation improvements, typo corrections, indentation
changes...
Revision Changes Path
No revision
No revision
1.19.2.1 +14 -15 jakarta-log4j/src/java/org/apache/log4j/AppenderSkeleton.java
Index: AppenderSkeleton.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/AppenderSkeleton.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- AppenderSkeleton.java 9 May 2002 17:44:54 -0000 1.19
+++ AppenderSkeleton.java 11 Jun 2002 13:17:38 -0000 1.19.2.1
@@ -17,13 +17,14 @@
/**
- Abstract superclass of the other appenders in the package.
-
- This class provides the code for common functionality, such as
- support for threshold filtering and support for general filters.
-
- @since 0.8.1
- @author Ceki Gülcü */
+ * Abstract superclass of the other appenders in the package.
+ *
+ * This class provides the code for common functionality, such as
+ * support for threshold filtering and support for general filters.
+ *
+ * @since 0.8.1
+ * @author Ceki Gülcü
+ * */
public abstract class AppenderSkeleton implements Appender, OptionHandler {
/** The layout variable does not need to be set if the appender
@@ -99,11 +100,10 @@
}
/**
- Finalize this appender by calling the imlenentation's
+ Finalize this appender by calling the derived class'
<code>close</code> method.
- @since 0.8.4
- */
+ @since 0.8.4 */
public
void finalize() {
// An appender might be closed then garbage collected. There is no
@@ -191,11 +191,10 @@
/**
- This method performs threshold checks and invokes filters before
- delegating actual logging to the subclasses specific {@link
- AppenderSkeleton#append} method.
-
- */
+ * This method performs threshold checks and invokes filters before
+ * delegating actual logging to the subclasses specific {@link
+ * AppenderSkeleton#append} method.
+ * */
public
synchronized
void doAppend(LoggingEvent event) {
1.34.2.1 +8 -8 jakarta-log4j/src/java/org/apache/log4j/FileAppender.java
Index: FileAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/FileAppender.java,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -r1.34 -r1.34.2.1
--- FileAppender.java 25 Apr 2002 21:18:15 -0000 1.34
+++ FileAppender.java 11 Jun 2002 13:17:38 -0000 1.34.2.1
@@ -20,14 +20,14 @@
// Ben Sandee
/**
- FileAppender appends log events to a file.
-
- <p>Support for <code>java.io.Writer</code> and console appending
- has been deprecated and then removed. See the replacement
- solutions: {@link WriterAppender} and {@link ConsoleAppender}.
-
-
- @author Ceki Gülcü */
+ * FileAppender appends log events to a file.
+ *
+ * <p>Support for <code>java.io.Writer</code> and console appending
+ * has been deprecated and then removed. See the replacement
+ * solutions: {@link WriterAppender} and {@link ConsoleAppender}.
+ *
+ * @author Ceki Gülcü
+ * */
public class FileAppender extends WriterAppender {
/** Append to or truncate the file? The default value for this
1.23.2.1 +11 -16 jakarta-log4j/src/java/org/apache/log4j/WriterAppender.java
Index: WriterAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/WriterAppender.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- WriterAppender.java 7 May 2002 23:24:51 -0000 1.23
+++ WriterAppender.java 11 Jun 2002 13:17:38 -0000 1.23.2.1
@@ -194,17 +194,18 @@
writeFooter();
reset();
}
+
/**
- Close the underlying {@link java.io.Writer}.
- */
- protected
- void closeWriter() {
+ * Close the underlying {@link java.io.Writer}.
+ * */
+ protected void closeWriter() {
if(qw != null) {
try {
qw.close();
} catch(IOException e) {
- LogLog.error("Could not close " + qw, e); // do need to invoke an error handler
- // at this late stage
+ // There is do need to invoke an error handler at this late
+ // stage.
+ LogLog.error("Could not close " + qw, e);
}
}
}
@@ -234,13 +235,11 @@
return retval;
}
- public
- String getEncoding() {
+ public String getEncoding() {
return encoding;
}
- public
- void setEncoding(String value) {
+ public void setEncoding(String value) {
encoding = value;
}
@@ -250,9 +249,7 @@
/**
Set the {@link ErrorHandler} for this WriterAppender and also the
underlying {@link QuietWriter} if any. */
- public
- synchronized
- void setErrorHandler(ErrorHandler eh) {
+ public synchronized void setErrorHandler(ErrorHandler eh) {
if(eh == null) {
LogLog.warn("You have tried to set a null error-handler.");
} else {
@@ -275,9 +272,7 @@
<p><b>WARNING:</b> Logging to an unopened Writer will fail.
<p>
@param writer An already opened Writer. */
- public
- synchronized
- void setWriter(Writer writer) {
+ public synchronized void setWriter(Writer writer) {
reset();
this.qw = new QuietWriter(writer, errorHandler);
//this.tp = new TracerPrintWriter(qw);
No revision
No revision
1.31.2.3 +7 -5 jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java
Index: LoggingEvent.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
diff -u -r1.31.2.2 -r1.31.2.3
--- LoggingEvent.java 22 May 2002 17:15:20 -0000 1.31.2.2
+++ LoggingEvent.java 11 Jun 2002 13:17:38 -0000 1.31.2.3
@@ -39,11 +39,13 @@
/** Fully qualified name of the calling category class. */
transient public final String fqnOfCategoryClass;
- /** The category of the logging event. The category field is not
- serialized for performance reasons.
-
- <p>It is set by the LoggingEvent constructor or set by a remote
- entity after deserialization. */
+ /**
+ * The category of the logging event. This field is not serialized
+ * for performance reasons.
+ *
+ * <p>It is set by the LoggingEvent constructor or set by a remote
+ * entity after deserialization.
+ * */
transient public Category logger;
/** The category (logger) name. */
No revision
No revision
1.2.2.2 +0 -39
jakarta-log4j/src/java/org/apache/log4j/varia/LevelRangeFilter.java
Index: LevelRangeFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/varia/LevelRangeFilter.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- LevelRangeFilter.java 28 May 2002 17:29:57 -0000 1.2.2.1
+++ LevelRangeFilter.java 11 Jun 2002 13:17:38 -0000 1.2.2.2
@@ -132,44 +132,5 @@
void setAcceptOnMatch(boolean acceptOnMatch) {
this.acceptOnMatch = acceptOnMatch;
}
-
-
- /**
- @deprecated We now use JavaBeans introspection to configure
- components.
- */
- public
- String[] getOptionStrings() {
- return new String[] {
- LEVEL_MIN_OPTION,
- LEVEL_MAX_OPTION,
- ACCEPT_ON_MATCH_OPTION};
- }
-
- /**
- @deprecated We now use JavaBeans introspection to configure
- components.
- */
- public
- void setOption(String key, String value) {
- if(key.equalsIgnoreCase(LEVEL_MIN_OPTION)) {
- levelMin = OptionConverter.toLevel(value, null);
- }
- else if (key.equalsIgnoreCase(LEVEL_MAX_OPTION)) {
- levelMax = OptionConverter.toLevel(value, null);
- }
- else if (key.equalsIgnoreCase(ACCEPT_ON_MATCH_OPTION)) {
- acceptOnMatch = OptionConverter.toBoolean(value, acceptOnMatch);
- }
- }
-
- /** See class comments */
- public static final String LEVEL_MIN_OPTION = "LevelMin";
-
- /** See class comments */
- public static final String LEVEL_MAX_OPTION = "LevelMax";
-
- /** See class comments */
- public static final String ACCEPT_ON_MATCH_OPTION = "AcceptOnMatch";
}
1.5.2.1 +1 -1
jakarta-log4j/src/java/org/apache/log4j/varia/LevelMatchFilter.java
Index: LevelMatchFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/varia/LevelMatchFilter.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- LevelMatchFilter.java 9 May 2002 15:43:44 -0000 1.5
+++ LevelMatchFilter.java 11 Jun 2002 13:17:38 -0000 1.5.2.1
@@ -3,7 +3,7 @@
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.APL file.
+ * the LICENSE.txt file.
*/
package org.apache.log4j.varia;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
