Author: markt
Date: Sat Nov 22 03:30:47 2008
New Revision: 719837
URL: http://svn.apache.org/viewvc?rev=719837&view=rev
Log:
o.a.juli generics
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=719837&r1=719836&r2=719837&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Sat Nov 22
03:30:47 2008
@@ -90,7 +90,7 @@
final String levelString = getProperty(loggerName + ".level");
if (levelString != null) {
try {
- AccessController.doPrivileged(new PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
logger.setLevel(Level.parse(levelString.trim()));
return null;
@@ -270,7 +270,7 @@
ClassLoaderLogInfo info = classLoaderLoggers.get(classLoader);
if (info == null) {
final ClassLoader classLoaderParam = classLoader;
- AccessController.doPrivileged(new PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
try {
readConfiguration(classLoaderParam);
@@ -445,7 +445,7 @@
*/
protected static void doSetParentLogger(final Logger logger,
final Logger parent) {
- AccessController.doPrivileged(new PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
logger.setParent(parent);
return null;
@@ -538,9 +538,9 @@
}
void setParentLogger(final Logger parent) {
- for (final Iterator iter = children.values().iterator(); iter
- .hasNext();) {
- final LogNode childNode = (LogNode) iter.next();
+ for (final Iterator<LogNode> iter =
+ children.values().iterator(); iter.hasNext();) {
+ final LogNode childNode = iter.next();
if (childNode.logger == null) {
childNode.setParentLogger(parent);
} else {
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=719837&r1=719836&r2=719837&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Sat Nov 22
03:30:47 2008
@@ -237,7 +237,7 @@
* @exception LogConfigurationException if a suitable <code>Log</code>
* instance cannot be returned
*/
- public Log getInstance(Class clazz)
+ public Log getInstance(Class<?> clazz)
throws LogConfigurationException {
return getInstance( clazz.getName());
}
@@ -292,7 +292,7 @@
* @exception LogConfigurationException if a suitable <code>Log</code>
* instance cannot be returned
*/
- public static Log getLog(Class clazz)
+ public static Log getLog(Class<?> clazz)
throws LogConfigurationException {
return (getFactory().getInstance(clazz));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
