reduce the number of Eclipse warnings to two

14 files changed, 24 insertions, 12 deletions

diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java
index 779ad5b7..dd12e850 100644
--- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java
+++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java
@@ -33,6 +33,7 @@ import org.apache.commons.logging.impl.SLF4JLogFactory;
  * @author Ceki Gülcü
  */
 
+@SuppressWarnings("rawtypes")
 public abstract class LogFactory {
 
   static String UNSUPPORTED_OPERATION_IN_JCL_OVER_SLF4J = "http://www.slf4j.org/codes.html#unsupported_operation_in_jcl_over_slf4j";
diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java
index c46b4579..bea2ba78 100644
--- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java
+++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java
@@ -49,7 +49,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author Richard A. Sitze
  * @author Ceki Gülcü
  */
-
+@SuppressWarnings("rawtypes")
 public class SLF4JLogFactory extends LogFactory {
 
   // ----------------------------------------------------------- Constructors
@@ -102,10 +102,11 @@ public class SLF4JLogFactory extends LogFactory {
    * attributes. If there are no such attributes, a zero length array is
    * returned.
    */
+  @SuppressWarnings("unchecked")
   public String[] getAttributeNames() {
 
-    List names = new ArrayList();
-    Enumeration keys = attributes.keys();
+    List<String> names = new ArrayList<String>();
+    Enumeration<String> keys = attributes.keys();
     while (keys.hasMoreElements()) {
       names.add((String) keys.nextElement());
     }
@@ -128,9 +129,7 @@ public class SLF4JLogFactory extends LogFactory {
    *              if a suitable <code>Log</code> instance cannot be returned
    */
   public Log getInstance(Class clazz) throws LogConfigurationException {
-
     return (getInstance(clazz.getName()));
-
   }
 
   /**
@@ -209,6 +208,7 @@ public class SLF4JLogFactory extends LogFactory {
    *          Value of the attribute to set, or <code>null</code> to remove
    *          any setting for this attribute
    */
+  @SuppressWarnings("unchecked")
   public void setAttribute(String name, Object value) {
 
     if (value == null) {
diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
index 765bca37..2b4858ce 100644
--- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
+++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
@@ -628,12 +628,11 @@ public class SimpleLog implements Log, Serializable {
     if (classLoader == null) {
       try {
         // Are we running on a JDK 1.2 or later system?
-        Method method = Thread.class.getMethod("getContextClassLoader", null);
+        Method method = Thread.class.getMethod("getContextClassLoader");
 
         // Get the thread context class loader (if there is one)
         try {
-          classLoader = (ClassLoader) method.invoke(Thread.currentThread(),
-              null);
+          classLoader = (ClassLoader) method.invoke(Thread.currentThread());
         } catch (IllegalAccessException e) {
           ; // ignore
         } catch (InvocationTargetException e) {
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
index 0c9142ac..4b853b34 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
@@ -40,6 +40,7 @@ import java.util.Enumeration;
  * @author S&eacute;bastien Pennec
  * @author Ceki G&uuml;lc&uuml;
  */
+@SuppressWarnings("rawtypes")
 public class Category {
 
   private static final String CATEGORY_FQCN = Category.class.getName();
@@ -77,6 +78,7 @@ public class Category {
     return name;
   }
 
+
   public Enumeration getAllAppenders() {
     return NullEnumeration.getInstance();
   }
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
index 0738092d..73c44931 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
@@ -34,6 +34,7 @@ import java.util.Vector;
  *
  * @author Ceki G&uuml;lc&uuml;
  */
+@SuppressWarnings("rawtypes")
 public class LogManager {
 
   public static Logger getRootLogger() {
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
index 6be9d24a..8e1bb2f2 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
@@ -28,6 +28,7 @@ import org.slf4j.spi.LocationAwareLogger;
  *
  * @author Ceki G&uuml;lc&uuml; 
  * */
+@SuppressWarnings("rawtypes")
 public class Logger extends Category {
   
   private static final String LOGGER_FQCN = Logger.class.getName();
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/MDC.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/MDC.java
index dbc96978..edc5524b 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/MDC.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/MDC.java
@@ -50,6 +50,7 @@ public class MDC {
    * has been called by other projects. This method is here temporarily  
    * until projects who are depending on this method release fixes. 
    */
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   @Deprecated
   public static Hashtable getContext() {
     Map map = org.slf4j.MDC.getCopyOfContextMap();
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/NDC.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/NDC.java
index 49acb380..8df9f7a3 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/NDC.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/NDC.java
@@ -38,10 +38,12 @@ public class NDC {
     }
   }
 
+  @SuppressWarnings("rawtypes")
   public static Stack cloneStack() {
     return null;
   }
 
+  @SuppressWarnings("rawtypes")
   public static void inherit(Stack stack) {
   }
 
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/helpers/NullEnumeration.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
index ff0a9d43..37a2f2fd 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
@@ -26,6 +26,7 @@ import java.util.NoSuchElementException;
  * @author Anders Kristensen
  * @since version 1.0
  */
+@SuppressWarnings("rawtypes")
 public class NullEnumeration implements Enumeration {
   private static final NullEnumeration instance = new NullEnumeration();
 
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java
index 9d606b7c..243af1fa 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java
@@ -81,11 +81,13 @@ public interface LoggerRepository {
     public
     abstract void shutdown();
 
+    @SuppressWarnings("rawtypes")
     public Enumeration getCurrentLoggers();
 
     /**
      * Deprecated. Please use {@link #getCurrentLoggers} instead.
      */
+    @SuppressWarnings("rawtypes")
     public Enumeration getCurrentCategories();
 
 
diff --git a/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java b/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java
index 02afa875..17fe85ca 100644
--- a/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java
+++ b/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java
@@ -31,7 +31,7 @@ import java.util.logging.LogRecord;
 
 public class ListHandler extends Handler {
 
-  List list = new ArrayList();
+  List<LogRecord> list = new ArrayList<LogRecord>();
   
   public void close() throws SecurityException {
 
diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/XLoggerFactory.java b/slf4j-ext/src/main/java/org/slf4j/ext/XLoggerFactory.java
index 04452d49..bd33e153 100644
--- a/slf4j-ext/src/main/java/org/slf4j/ext/XLoggerFactory.java
+++ b/slf4j-ext/src/main/java/org/slf4j/ext/XLoggerFactory.java
@@ -59,7 +59,7 @@ public class XLoggerFactory {
    * @param clazz
    * @return XLogger instance by name
    */
-  public static XLogger getXLogger(Class clazz) {
+  public static XLogger getXLogger(Class<?> clazz) {
     return getXLogger(clazz.getName());
   }
 }
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
index 1f616585..47ddf372 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
@@ -64,6 +64,7 @@ public class Log4jMDCAdapter implements MDCAdapter {
     org.apache.log4j.MDC.remove(key);
   }
 
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   public Map getCopyOfContextMap() {
     Map old = org.apache.log4j.MDC.getContext();
     if(old != null) {
@@ -73,6 +74,7 @@ public class Log4jMDCAdapter implements MDCAdapter {
     }
   }
 
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   public void setContextMap(Map contextMap) {
     Map old = org.apache.log4j.MDC.getContext();
     if(old == null) {
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
index 43d3b247..3f467a18 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -72,10 +72,10 @@ public class StaticLoggerBinder implements LoggerFactoryBinder {
   private StaticLoggerBinder() {
     loggerFactory = new Log4jLoggerFactory();
     try {
+      @SuppressWarnings("unused")
       Level level = Level.TRACE;
     } catch (NoSuchFieldError nsfe) {
-      Util
-          .report("This version of SLF4J requires log4j version 1.2.12 or later. See also http://www.slf4j.org/codes.html#log4j_version");
+      Util.report("This version of SLF4J requires log4j version 1.2.12 or later. See also http://www.slf4j.org/codes.html#log4j_version");
     }
   }