pathos 2002/11/22 02:27:24
Modified: src/java/org/apache/log4j PluginRegistry.java Level.java
PropertyConfigurator.java PatternLayout.java
TTCCLayout.java PluginSkeleton.java Category.java
LogManager.java Receiver.java Plugin.java
Logger.java Hierarchy.java
Log:
Small updates.
Revision Changes Path
1.3 +0 -1 jakarta-log4j/src/java/org/apache/log4j/PluginRegistry.java
Index: PluginRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/PluginRegistry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PluginRegistry.java 22 Nov 2002 04:52:19 -0000 1.2
+++ PluginRegistry.java 22 Nov 2002 10:27:23 -0000 1.3
@@ -100,7 +100,6 @@
Stops a plugin in the given logger repository. */
public static Plugin stopPlugin(String pluginName,
LoggerRepository repository) {
- String name = pluginName;
if (pluginName == null) {
pluginName = "";
}
1.9 +2 -2 jakarta-log4j/src/java/org/apache/log4j/Level.java
Index: Level.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Level.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Level.java 13 Feb 2002 23:58:04 -0000 1.8
+++ Level.java 22 Nov 2002 10:27:23 -0000 1.9
@@ -80,7 +80,7 @@
public
static
Level toLevel(String sArg) {
- return (Level) toLevel(sArg, Level.DEBUG);
+ return toLevel(sArg, Level.DEBUG);
}
/**
@@ -91,7 +91,7 @@
public
static
Level toLevel(int val) {
- return (Level) toLevel(val, Level.DEBUG);
+ return toLevel(val, Level.DEBUG);
}
/**
1.56 +2 -3
jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- PropertyConfigurator.java 9 Oct 2002 22:50:02 -0000 1.55
+++ PropertyConfigurator.java 22 Nov 2002 10:27:23 -0000 1.56
@@ -398,8 +398,7 @@
String thresholdStr = OptionConverter.findAndSubst(THRESHOLD_PREFIX,
properties);
if(thresholdStr != null) {
- hierarchy.setThreshold(OptionConverter.toLevel(thresholdStr,
- (Level) Level.ALL));
+ hierarchy.setThreshold(OptionConverter.toLevel(thresholdStr, Level.ALL));
LogLog.debug("Hierarchy threshold set to ["+hierarchy.getThreshold()+"].");
}
@@ -585,7 +584,7 @@
logger.setLevel(null);
}
} else {
- logger.setLevel(OptionConverter.toLevel(levelStr, (Level) Level.DEBUG));
+ logger.setLevel(OptionConverter.toLevel(levelStr, Level.DEBUG));
}
LogLog.debug("Category " + loggerName + " set to " + logger.getLevel());
}
1.17 +0 -2 jakarta-log4j/src/java/org/apache/log4j/PatternLayout.java
Index: PatternLayout.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/PatternLayout.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PatternLayout.java 24 Apr 2002 21:21:32 -0000 1.16
+++ PatternLayout.java 22 Nov 2002 10:27:23 -0000 1.17
@@ -408,8 +408,6 @@
private PatternConverter head;
- private String timezone;
-
/**
Constructs a PatternLayout using the DEFAULT_LAYOUT_PATTERN.
1.18 +0 -5 jakarta-log4j/src/java/org/apache/log4j/TTCCLayout.java
Index: TTCCLayout.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/TTCCLayout.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TTCCLayout.java 9 Oct 2002 22:50:02 -0000 1.17
+++ TTCCLayout.java 22 Nov 2002 10:27:23 -0000 1.18
@@ -156,11 +156,6 @@
<p>Time, thread, category and diagnostic context are printed
depending on options.
-
- @param category
- @param level
- @param message
-
*/
public
String format(LoggingEvent event) {
1.2 +0 -2 jakarta-log4j/src/java/org/apache/log4j/PluginSkeleton.java
Index: PluginSkeleton.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/PluginSkeleton.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginSkeleton.java 20 Sep 2002 05:30:01 -0000 1.1
+++ PluginSkeleton.java 22 Nov 2002 10:27:23 -0000 1.2
@@ -7,8 +7,6 @@
package org.apache.log4j;
-import java.util.Vector;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.LoggerRepository;
/**
1.70 +1 -1 jakarta-log4j/src/java/org/apache/log4j/Category.java
Index: Category.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Category.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Category.java 9 Oct 2002 22:50:01 -0000 1.69
+++ Category.java 22 Nov 2002 10:27:23 -0000 1.70
@@ -312,7 +312,7 @@
@deprecated Please use {@link LogManager#exists} instead.
- @version 0.8.5 */
+ @since 0.8.5 */
public
static
Logger exists(String name) {
1.10 +1 -1 jakarta-log4j/src/java/org/apache/log4j/LogManager.java
Index: LogManager.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/LogManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LogManager.java 16 Oct 2002 13:52:50 -0000 1.9
+++ LogManager.java 22 Nov 2002 10:27:23 -0000 1.10
@@ -66,7 +66,7 @@
static {
// By default we use a DefaultRepositorySelector which always returns 'h'.
- Hierarchy h = new Hierarchy(new RootCategory((Level) Level.DEBUG));
+ Hierarchy h = new Hierarchy(new RootCategory(Level.DEBUG));
repositorySelector = new DefaultRepositorySelector(h);
1.4 +0 -2 jakarta-log4j/src/java/org/apache/log4j/Receiver.java
Index: Receiver.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Receiver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Receiver.java 22 Oct 2002 19:40:40 -0000 1.3
+++ Receiver.java 22 Nov 2002 10:27:23 -0000 1.4
@@ -7,9 +7,7 @@
package org.apache.log4j;
-import java.util.Vector;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LoggerRepository;
/**
Defines the base class for Receiver plugins.
1.2 +0 -1 jakarta-log4j/src/java/org/apache/log4j/Plugin.java
Index: Plugin.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Plugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Plugin.java 20 Sep 2002 05:30:01 -0000 1.1
+++ Plugin.java 22 Nov 2002 10:27:23 -0000 1.2
@@ -7,7 +7,6 @@
package org.apache.log4j;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.OptionHandler;
1.17 +0 -6 jakarta-log4j/src/java/org/apache/log4j/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Logger.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Logger.java 25 Apr 2002 22:22:07 -0000 1.16
+++ Logger.java 22 Nov 2002 10:27:23 -0000 1.17
@@ -19,12 +19,6 @@
@author Ceki Gülcü */
public class Logger extends Category {
- /**
- The fully qualified name of the Level class. See also the
- getFQCN method. */
- private static final String FQCN = Level.class.getName();
-
-
protected
Logger(String name) {
super(name);
1.42 +3 -4 jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java
Index: Hierarchy.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Hierarchy.java 22 Nov 2002 04:51:39 -0000 1.41
+++ Hierarchy.java 22 Nov 2002 10:27:23 -0000 1.42
@@ -101,7 +101,7 @@
/**
@deprecated As of v1.3, use {@link #addLoggerRepositoryEventListener}
- and {@link addLoggerEventListener} methods instead. */
+ and {@link #addLoggerEventListener} methods instead. */
public
void addHierarchyEventListener(HierarchyEventListener listener) {
if(listeners.contains(listener)) {
@@ -214,7 +214,7 @@
*/
public
void setThreshold(String levelStr) {
- Level l = (Level) Level.toLevel(levelStr, null);
+ Level l = Level.toLevel(levelStr, null);
if(l != null) {
setThreshold(l);
} else {
@@ -334,7 +334,6 @@
/**
Requests that a configuration changed event be sent to any registered
{@link LoggerRepositoryEventListener}.
- @param logger The logger which changed levels.
@since 1.3*/
public void fireConfigurationChangedEvent() {
if(repositoryEventListeners != null) {
@@ -519,7 +518,7 @@
public
void resetConfiguration() {
- getRootLogger().setLevel((Level) Level.DEBUG);
+ getRootLogger().setLevel(Level.DEBUG);
root.setResourceBundle(null);
setThreshold(Level.ALL);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
