svn commit: r619236 - in /mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common: HttpVersion.java HttpVersionDecodingState.java

[mheath]

Author: mheath
Date: Wed Feb  6 16:57:26 2008
New Revision: 619236

URL: http://svn.apache.org/viewvc?rev=619236&view=rev
Log:
ASYNCWEB-2
Moved a bunch of non-codec classes out of the codec package.
Moved timeout setting to AsyncHttpClient and out of HttpRequestMessage.
Other general cleanup.

Modified:
    
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersion.java
    
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java

Modified: 
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersion.java
URL: 
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersion.java?rev=619236&r1=619235&r2=619236&view=diff
==============================================================================
--- 
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersion.java
 (original)
+++ 
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersion.java
 Wed Feb  6 16:57:26 2008
@@ -19,9 +19,6 @@
  */
 package org.apache.asyncweb.common;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
 
 /**
  * Type safe enumeration representing HTTP protocol version
@@ -29,29 +26,30 @@
  * @author The Apache MINA Project ([EMAIL PROTECTED])
  * @version $Rev$, $Date$
  */
-public class HttpVersion implements Serializable {
-
-    private static final long serialVersionUID = -7727691335746596528L;
-
+public enum HttpVersion {
     /**
      * HTTP 1/1
      */
-    public static final HttpVersion HTTP_1_1 = new HttpVersion("HTTP/1.1");
+    HTTP_1_1("HTTP/1.1"),
 
     /**
      * HTTP 1/0
      */
-    public static final HttpVersion HTTP_1_0 = new HttpVersion("HTTP/1.0");
+    HTTP_1_0("HTTP/1.0");
 
-    private final String name;
+    private final String value;
 
+    private HttpVersion(String value) {
+        this.value = value;
+    }
+    
     /**
      * Returns the [EMAIL PROTECTED] HttpVersion} instance from the specified 
string.
      *
      * @return       The version, or <code>null</code> if no version is
      *               found
      */
-    public static HttpVersion valueOf(String string) {
+    public static HttpVersion fromString(String string) {
         if (HTTP_1_1.toString().equalsIgnoreCase(string)) {
             return HTTP_1_1;
         }
@@ -68,20 +66,7 @@
      */
     @Override
     public String toString() {
-        return name;
+        return value;
     }
 
-    private HttpVersion(String name) {
-        this.name = name;
-    }
-
-    private Object readResolve() throws ObjectStreamException {
-        HttpVersion answer = valueOf(this.name);
-        if (answer == null) {
-            throw new InvalidObjectException("Unknown HTTP version: "
-                    + this.name);
-        } else {
-            return answer;
-        }
-    }
 }

Modified: 
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
URL: 
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java?rev=619236&r1=619235&r2=619236&view=diff
==============================================================================
--- 
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
 (original)
+++ 
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
 Wed Feb  6 16:57:26 2008
@@ -46,7 +46,7 @@
             HttpVersion version = null;
             try {
                 versionStr = product.getString(asciiDecoder);
-                version = HttpVersion.valueOf(versionStr);
+                version = HttpVersion.fromString(versionStr);
             } catch (CharacterCodingException e) {
                 // Will take care down the
             }