svn commit: r521098 - in /mina/trunk/core/src/main/java/org/apache/mina: filter/codec/ProtocolCodecFilter.java filter/codec/demux/DemuxingProtocolCodecFactory.java util/CharsetUtil.java

[trustin]

Author: trustin
Date: Wed Mar 21 20:09:18 2007
New Revision: 521098

URL: http://svn.apache.org/viewvc?view=rev&rev=521098
Log:
Fixed compiler warnings


Modified:
    
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
    
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
    mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?view=diff&rev=521098&r1=521097&r2=521098
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
 Wed Mar 21 20:09:18 2007
@@ -83,7 +83,9 @@
         };
     }
     
-    public ProtocolCodecFilter( final Class encoderClass, final Class 
decoderClass )
+    public ProtocolCodecFilter(
+            final Class<? extends ProtocolEncoder> encoderClass,
+            final Class<? extends ProtocolDecoder> decoderClass )
     {
         if( encoderClass == null )
         {
@@ -122,12 +124,12 @@
         {
             public ProtocolEncoder getEncoder() throws Exception
             {
-                return ( ProtocolEncoder ) encoderClass.newInstance();
+                return encoderClass.newInstance();
             }
 
             public ProtocolDecoder getDecoder() throws Exception
             {
-                return ( ProtocolDecoder ) decoderClass.newInstance();
+                return decoderClass.newInstance();
             }
         };
     }

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?view=diff&rev=521098&r1=521097&r2=521098
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
 Wed Mar 21 20:09:18 2007
@@ -71,7 +71,7 @@
     {
     }
     
-    public void register( Class encoderOrDecoderClass )
+    public void register( Class<?> encoderOrDecoderClass )
     {
         if( encoderOrDecoderClass == null )
         {

Modified: mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java?view=diff&rev=521098&r1=521097&r2=521098
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java 
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java Wed Mar 
21 20:09:18 2007
@@ -37,7 +37,7 @@
         // Use reflection here to be able to compile mina with jdk 1.4.
         try
         {
-            Class charsetClass = Class.forName( "java.nio.charset.Charset" );
+            Class<?> charsetClass = Class.forName( "java.nio.charset.Charset" 
);
             Object charSet = charsetClass.getMethod( "defaultCharset", ( 
Class[] ) null ).invoke( null, ( Object[] ) null );
             return ( String ) charsetClass.getMethod( "name", ( Class[] ) null 
).invoke( charSet, ( Object[] ) null );
         }