svn commit: r521103 - in /mina/trunk/core/src: main/java/org/apache/mina/filter/codec/textline/ main/java/org/apache/mina/util/ test/java/org/apache/mina/util/

[trustin]

Author: trustin
Date: Wed Mar 21 20:12:52 2007
New Revision: 521103

URL: http://svn.apache.org/viewvc?view=rev&rev=521103
Log:
Removed CharsetUtil because it's not needed for Java 5+


Removed:
    mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java
    mina/trunk/core/src/test/java/org/apache/mina/util/CharsetUtilTest.java
Modified:
    
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java
    
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java
    
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java?view=diff&rev=521103&r1=521102&r2=521103
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java
 Wed Mar 21 20:12:52 2007
@@ -25,7 +25,6 @@
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
 import org.apache.mina.filter.codec.ProtocolDecoder;
 import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.mina.util.CharsetUtil;
 
 /**
  * A [EMAIL PROTECTED] ProtocolCodecFactory} that performs encoding and 
decoding between
@@ -45,7 +44,7 @@
      */
     public TextLineCodecFactory()
     {
-        this( Charset.forName( CharsetUtil.getDefaultCharsetName() ) );
+        this( Charset.defaultCharset() );
     }
     
     /**

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java?view=diff&rev=521103&r1=521102&r2=521103
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java
 Wed Mar 21 20:12:52 2007
@@ -28,7 +28,6 @@
 import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolDecoder;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.apache.mina.util.CharsetUtil;
 
 /**
  * A [EMAIL PROTECTED] ProtocolDecoder} which decodes a text line into a 
string.
@@ -51,7 +50,7 @@
      */
     public TextLineDecoder()
     {
-        this( CharsetUtil.getDefaultCharset(), LineDelimiter.AUTO );
+        this( Charset.defaultCharset(), LineDelimiter.AUTO );
     }
     
     /**

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java?view=diff&rev=521103&r1=521102&r2=521103
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java
 Wed Mar 21 20:12:52 2007
@@ -27,7 +27,6 @@
 import org.apache.mina.filter.codec.ProtocolEncoder;
 import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-import org.apache.mina.util.CharsetUtil;
 
 /**
  * A [EMAIL PROTECTED] ProtocolEncoder} which encodes a string into a text line
@@ -46,12 +45,12 @@
 
     public TextLineEncoder()
     {
-        this( CharsetUtil.getDefaultCharset(), LineDelimiter.UNIX );
+        this( Charset.defaultCharset(), LineDelimiter.UNIX );
     }
     
     public TextLineEncoder( LineDelimiter delimiter )
     {
-        this( CharsetUtil.getDefaultCharset(), delimiter );
+        this( Charset.defaultCharset(), delimiter );
     }
     
     public TextLineEncoder( Charset charset )