svn commit: r521104 - in /mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec: HttpRequestDecoder.java HttpResponseEncoder.java

[tr...@apache.org]

Author: trustin
Date: Wed Mar 21 20:15:17 2007
New Revision: 521104

URL: http://svn.apache.org/viewvc?view=rev&rev=521104
Log:
Fixed compilation errors in the examples

Modified:
    mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java
    mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java

Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java?view=diff&rev=521104&r1=521103&r2=521104
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java Wed Mar 21 20:15:17 2007
@@ -24,6 +24,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.util.HashMap;
 import java.util.Map;
@@ -31,9 +32,9 @@
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.mina.filter.codec.demux.MessageDecoder;
 import org.apache.mina.filter.codec.demux.MessageDecoderAdapter;
 import org.apache.mina.filter.codec.demux.MessageDecoderResult;
-import org.apache.mina.util.CharsetUtil;
 
 /**
  * A {@link MessageDecoder} that decodes {@link HttpRequest}.
@@ -46,8 +47,7 @@
     private static final byte[] CONTENT_LENGTH = new String( "Content-Length:" )
             .getBytes();
 
-    private CharsetDecoder decoder = CharsetUtil.getDefaultCharset()
-            .newDecoder();
+    private CharsetDecoder decoder = Charset.defaultCharset().newDecoder();
 
     private HttpRequestMessage request = null;
 

Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java?view=diff&rev=521104&r1=521103&r2=521104
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java Wed Mar 21 20:15:17 2007
@@ -20,18 +20,18 @@
 package org.apache.mina.example.httpserver.codec;
 
 import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Map.Entry;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
 import org.apache.mina.filter.codec.demux.MessageEncoder;
-import org.apache.mina.util.CharsetUtil;
 
 /**
  * A {@link MessageEncoder} that encodes {@link HttpResponseMessage}.
@@ -67,8 +67,7 @@
         try
         {
             // output all headers except the content length
-            CharsetEncoder encoder = CharsetUtil.getDefaultCharset()
-                    .newEncoder();
+            CharsetEncoder encoder = Charset.defaultCharset().newEncoder();
             buf.putString( "HTTP/1.1 ", encoder );
             buf.putString( String.valueOf( msg.getResponseCode() ), encoder );
             switch( msg.getResponseCode() )