o.a.juli generics

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719837 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index ccfd6ab..0a5f2f7 100644 (file)
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -90,7 +90,7 @@ public class ClassLoaderLogManager extends LogManager {
         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 @@ public class ClassLoaderLogManager extends LogManager {
         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 @@ public class ClassLoaderLogManager extends LogManager {
      */
     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 @@ public class ClassLoaderLogManager extends LogManager {
         }
 
         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 {

diff --git a/java/org/apache/juli/logging/LogFactory.java b/java/org/apache/juli/logging/LogFactory.java
index bb83f99..0bd46cc 100644 (file)
--- a/java/org/apache/juli/logging/LogFactory.java
+++ b/java/org/apache/juli/logging/LogFactory.java
@@ -237,7 +237,7 @@ public /* abstract */ class LogFactory {
      * @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 @@ public /* abstract */ class LogFactory {
      * @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));