Return-Path: Delivered-To: apmail-mina-commits-archive@locus.apache.org Received: (qmail 81760 invoked from network); 22 Mar 2007 03:13:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Mar 2007 03:13:13 -0000 Received: (qmail 69994 invoked by uid 500); 22 Mar 2007 03:13:21 -0000 Delivered-To: apmail-mina-commits-archive@mina.apache.org Received: (qmail 69961 invoked by uid 500); 22 Mar 2007 03:13:21 -0000 Mailing-List: contact commits-help@mina.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mina.apache.org Delivered-To: mailing list commits@mina.apache.org Received: (qmail 69945 invoked by uid 99); 22 Mar 2007 03:13:21 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 20:13:21 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 20:13:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EEC481A983E; Wed, 21 Mar 2007 20:12:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Thu, 22 Mar 2007 03:12:52 -0000 To: commits@mina.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070322031252.EEC481A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {@link 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 {@link 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 {@link 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 )