[slf4j-dev] svn commit: r1328 - in slf4j/trunk/slf4j-ext/src: main/java/org/slf4j/ext test/java/org/slf4j/dummyExt

[ceki at slf4j.org]

Author: ceki
Date: Thu Apr 23 17:54:17 2009
New Revision: 1328

Modified:
   slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java
   slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java
   slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java
   slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java

Log:
Fewer eclipse warnings

Modified: slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java
==============================================================================
--- slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java	(original)
+++ slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventData.java	Thu Apr 23 17:54:17 2009
@@ -200,7 +200,7 @@
    * @param data
    *          The Map to copy.
    */
-  public void putAll(Map data) {
+  public void putAll(Map<String, Object> data) {
     this.eventData.putAll(data);
   }
 
@@ -218,7 +218,7 @@
    * 
    * @return an Iterator that can be used to access all the event attributes.
    */
-  public Iterator getEntrySetIterator() {
+  public Iterator<Map.Entry<String, Object>> getEntrySetIterator() {
     return this.eventData.entrySet().iterator();
   }
 
@@ -228,7 +228,7 @@
    * 
    * @return The Map of attributes in this EventData instance.
    */
-  public Map getEventMap() {
+  public Map<String, Object> getEventMap() {
     return this.eventData;
   }
 

Modified: slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java
==============================================================================
--- slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java	(original)
+++ slf4j/trunk/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java	Thu Apr 23 17:54:17 2009
@@ -5,8 +5,6 @@
 import org.slf4j.MarkerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
-import java.util.Map;
-
 /**
  * Simple Logger used to log events. All events are directed to a logger named "EventLogger"
  * with a level of INFO and with an Event marker.

Modified: slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java
==============================================================================
--- slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java	(original)
+++ slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java	Thu Apr 23 17:54:17 2009
@@ -24,19 +24,17 @@
 
 package org.slf4j.dummyExt;
 
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
 import junit.framework.TestCase;
 
 import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
+import org.slf4j.MDC;
 import org.slf4j.ext.EventData;
 import org.slf4j.ext.EventLogger;
-import org.slf4j.MDC;
-
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
 
 public class EventLoggerTest extends TestCase {
 

Modified: slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java
==============================================================================
--- slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java	(original)
+++ slf4j/trunk/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java	Thu Apr 23 17:54:17 2009
@@ -109,7 +109,7 @@
     assertEquals(2, listAppender.list.size());
     verifyWithException((LoggingEvent) listAppender.list.get(0), "throwing", t);
     LoggingEvent event = (LoggingEvent)listAppender.list.get(1);
-    verifyWithLevelAndException((LoggingEvent) listAppender.list.get(1), XLogger.Level.DEBUG,
+    verifyWithLevelAndException(event, XLogger.Level.DEBUG,
         "throwing", t);
   }