svn commit: r556316 - /mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java

[mheath]

Author: mheath
Date: Sat Jul 14 11:15:52 2007
New Revision: 556316

URL: http://svn.apache.org/viewvc?view=rev&rev=556316
Log:
Fixed parameterized types on Class.
Fixed parameterized types on MessageHandler to be <? extends E> and not <? 
super E> since E is not implenting MessageHandler.

Modified:
    
mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java?view=diff&rev=556316&r1=556315&r2=556316
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
 Sat Jul 14 11:15:52 2007
@@ -77,9 +77,11 @@
  * @version $Rev$, $Date$
  */
 public class DemuxingIoHandler extends IoHandlerAdapter {
-    private final Map<Class, MessageHandler> findHandlerCache = new 
ConcurrentHashMap<Class, MessageHandler>();
+    @SuppressWarnings("unchecked")
+    private final Map<Class<?>, MessageHandler> findHandlerCache = new 
ConcurrentHashMap<Class<?>, MessageHandler>();
 
-    private final Map<Class, MessageHandler> type2handler = new 
ConcurrentHashMap<Class, MessageHandler>();
+    @SuppressWarnings("unchecked")
+    private final Map<Class<?>, MessageHandler> type2handler = new 
ConcurrentHashMap<Class<?>, MessageHandler>();
 
     /**
      * Creates a new instance with no registered [EMAIL PROTECTED] 
MessageHandler}s.
@@ -95,8 +97,8 @@
      *         the specified <tt>type</tt>.  <tt>null</tt> otherwise.
      */
     @SuppressWarnings("unchecked")
-    public <E> MessageHandler<? super E> addMessageHandler(Class<E> type,
-            MessageHandler<? super E> handler) {
+    public <E> MessageHandler<? extends E> addMessageHandler(Class<E> type,
+            MessageHandler<? extends E> handler) {
         findHandlerCache.clear();
         return type2handler.put(type, handler);
     }
@@ -108,7 +110,7 @@
      * @return the removed handler if successfully removed.  <tt>null</tt> 
otherwise.
      */
     @SuppressWarnings("unchecked")
-    public <E> MessageHandler<? super E> removeMessageHandler(Class<E> type) {
+    public <E> MessageHandler<? extends E> removeMessageHandler(Class<E> type) 
{
         findHandlerCache.clear();
         return type2handler.remove(type);
     }
@@ -118,7 +120,7 @@
      * the specified <code>type</code>. 
      */
     @SuppressWarnings("unchecked")
-    public <E> MessageHandler<? super E> getMessageHandler(Class<E> type) {
+    public <E> MessageHandler<? extends E> getMessageHandler(Class<E> type) {
         return type2handler.get(type);
     }
 
@@ -126,7 +128,8 @@
      * Returns the [EMAIL PROTECTED] Map} which contains all [EMAIL PROTECTED] 
MessageHandler}
      * pairs registered to this handler.
      */
-    public Map<Class, MessageHandler> getMessageHandlerMap() {
+    @SuppressWarnings("unchecked")
+    public Map<Class<?>, MessageHandler> getMessageHandlerMap() {
         return Collections.unmodifiableMap(type2handler);
     }
 
@@ -146,7 +149,7 @@
         }
     }
 
-    protected MessageHandler<Object> findHandler(Class type) {
+    protected MessageHandler<Object> findHandler(Class<?> type) {
         return findHandler(type, null);
     }