openamf/src/java/org/openamf AMFBody.java,1.13,1.14 AMFError.java,1.7,1.8 AMFHeader.java,1.5,1.6 AMFMessage.java,1.8,1.9 ASObject.java,1.5,1.6

Update of /cvsroot/openamf/openamf/src/java/org/openamf
In directory sc8-pr-cvs1:/tmp/cvs-serv13549/java/org/openamf

Modified Files:
	AMFBody.java AMFError.java AMFHeader.java AMFMessage.java 
	ASObject.java 
Log Message:
javadoc fix and code cleanup

Index: AMFBody.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/AMFBody.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AMFBody.java	9 Aug 2003 16:59:22 -0000	1.13
--- AMFBody.java	15 Aug 2003 18:52:08 -0000	1.14
***************
*** 10,13 ****
--- 10,15 ----
  
  /**
+  * AMF Body
+  *
   * @author Jason Calabrese <[email protected]>
   * @author Pat Maddox <[email protected]>
***************
*** 17,21 ****
   */
  public class AMFBody {
- 	
  	protected String target;
  	protected String serviceName;
--- 19,22 ----
***************
*** 24,40 ****
  	protected Object value;
  	protected byte type;
! 	
  	public static final byte DATA_TYPE_UNKNOWN = -1;
  	public static final byte DATA_TYPE_NUMBER = 0;
  	public static final byte DATA_TYPE_BOOLEAN = 1;
  	public static final byte DATA_TYPE_STRING = 2;
  	public static final byte DATA_TYPE_OBJECT = 3;
  	public static final byte DATA_TYPE_NULL = 5;
  	public static final byte DATA_TYPE_FLUSHED_SHARED_OBJECT = 7;
  	public static final byte DATA_TYPE_MIXED_ARRAY = 8;
  	public static final byte DATA_TYPE_ARRAY = 10;
  	public static final byte DATA_TYPE_DATE = 11;
  	public static final byte DATA_TYPE_AS_OBJECT = 13;
  	public static final byte DATA_TYPE_XML = 15;
  	public static final byte DATA_TYPE_CUSTOM_CLASS = 16;
  
--- 25,87 ----
  	protected Object value;
  	protected byte type;
! 	/**
!      * Unknow object type
!      */
  	public static final byte DATA_TYPE_UNKNOWN = -1;
+     /**
+      * Number object type
+      */
  	public static final byte DATA_TYPE_NUMBER = 0;
+     /**
+      * Boolean object type
+      */
  	public static final byte DATA_TYPE_BOOLEAN = 1;
+     /**
+      * String object type
+      */
  	public static final byte DATA_TYPE_STRING = 2;
+     /**
+      * Object object type
+      */
  	public static final byte DATA_TYPE_OBJECT = 3;
+     /**
+      * NULL object type
+      */
  	public static final byte DATA_TYPE_NULL = 5;
+     /**
+      * NULL object type
+      */
+     public static final byte DATA_TYPE_NULL2 = 6;
+     /**
+      * Flushed shared object type
+      */
  	public static final byte DATA_TYPE_FLUSHED_SHARED_OBJECT = 7;
+     /**
+      * Mixed Array Object type
+      */
  	public static final byte DATA_TYPE_MIXED_ARRAY = 8;
+     /**
+      * Array Object type
+      */
  	public static final byte DATA_TYPE_ARRAY = 10;
+     /**
+      * Date object type
+      */
  	public static final byte DATA_TYPE_DATE = 11;
+     /**
+      * Long String object type
+      */
+     public static final byte DATA_TYPE_STRING_LONG = 12;
+     /**
+      *
+      */
  	public static final byte DATA_TYPE_AS_OBJECT = 13;
+     /**
+      * XML Document object type
+      */
  	public static final byte DATA_TYPE_XML = 15;
+     /**
+      * Custom class object type
+      */
  	public static final byte DATA_TYPE_CUSTOM_CLASS = 16;
  
***************
*** 44,57 ****
  
  	public AMFBody(String target, String response, Object value, byte type) {
- 		this.target = target;
  		this.response = response;
  		this.value = value;
  		this.type = type;
! 		
! 		int dotIndex = target.lastIndexOf('.');
! 		if (dotIndex > 0) {
! 			this.serviceName = target.substring(0, dotIndex);
! 			this.serviceMethodName = target.substring(dotIndex + 1);
! 		}
  	}
  
--- 91,98 ----
  
  	public AMFBody(String target, String response, Object value, byte type) {
  		this.response = response;
  		this.value = value;
  		this.type = type;
! 		setTarget(target);
  	}
  
***************
*** 103,107 ****
  	public String toString() {
  		StringBuffer sb = new StringBuffer();
! 		sb.append("target=");
  		sb.append(getTarget());
  		sb.append(",serviceName=");
--- 144,148 ----
  	public String toString() {
  		StringBuffer sb = new StringBuffer();
!         sb.append("[FmfBody: {target=");
  		sb.append(getTarget());
  		sb.append(",serviceName=");
***************
*** 127,130 ****
--- 168,174 ----
  				sb.append("STRING");
  				break;
+             case DATA_TYPE_STRING_LONG:
+                 sb.append("STRING_LONG");
+                 break;
  			case DATA_TYPE_OBJECT:
  				sb.append("OBJECT");
***************
*** 158,162 ****
  				break;
  		}
! 			
  		return sb.toString();
  	}
--- 202,206 ----
  				break;
  		}
!         sb.append("}]");
  		return sb.toString();
  	}

Index: AMFError.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/AMFError.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AMFError.java	9 Aug 2003 16:59:22 -0000	1.7
--- AMFError.java	15 Aug 2003 18:52:08 -0000	1.8
***************
*** 13,18 ****
   */
  public class AMFError {
- 
- 
  	private String code;
  	private String type;
--- 13,16 ----

Index: AMFHeader.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/AMFHeader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AMFHeader.java	9 Aug 2003 16:59:22 -0000	1.5
--- AMFHeader.java	15 Aug 2003 18:52:08 -0000	1.6
***************
*** 9,63 ****
  
  /**
   * @author Jason Calabrese <[email protected]>
   * @author Pat Maddox <[email protected]>
   * @see AMFBody
   * @see AMFMessage
!   * @version $Revision$, $Date$
!   */
  public class AMFHeader {
! 	protected String key;
! 	protected boolean required;
! 	protected Object value;
  
! 	public AMFHeader(String key, boolean required, Object value) {
! 		this.key = key;
! 		this.required = required;
! 		this.value = value;
! 	}
  
! 	public String getKey() {
! 		return key;
! 	}
  
! 	public void setKey(String key) {
! 		this.key = key;
! 	}
  
! 	public boolean isRequired() {
! 		return required;
! 	}
  
! 	public void setRequired(boolean required) {
! 		this.required = required;
! 	}
  
! 	public Object getValue() {
! 		return value;
! 	}
  
! 	public void setValue(Object value) {
! 		this.value = value;
! 	}
  
! 	public String toString() {
! 		StringBuffer sb = new StringBuffer();
! 		sb.append("key=");
! 		sb.append(getKey());
! 		sb.append(", required=");
! 		sb.append(isRequired());
! 		sb.append(", value=");
! 		sb.append(getValue());
! 		return sb.toString();
! 	}
  
  }
--- 9,66 ----
  
  /**
+  * AMF Header
+  *
   * @author Jason Calabrese <[email protected]>
   * @author Pat Maddox <[email protected]>
   * @see AMFBody
   * @see AMFMessage
!  * @version $Revision$, $Date$
!  */
  public class AMFHeader {
!     protected String key;
!     protected boolean required;
!     protected Object value;
  
!     public AMFHeader(String key, boolean required, Object value) {
!         this.key = key;
!         this.required = required;
!         this.value = value;
!     }
  
!     public String getKey() {
!         return key;
!     }
  
!     public void setKey(String key) {
!         this.key = key;
!     }
  
!     public boolean isRequired() {
!         return required;
!     }
  
!     public void setRequired(boolean required) {
!         this.required = required;
!     }
  
!     public Object getValue() {
!         return value;
!     }
  
!     public void setValue(Object value) {
!         this.value = value;
!     }
  
!     public String toString() {
!         StringBuffer sb = new StringBuffer();
!         sb.append("[FmfHeader: {key=");
!         sb.append(key);
!         sb.append(", required=");
!         sb.append(required);
!         sb.append(", value=");
!         sb.append(value);
!         sb.append("}]");
!         return sb.toString();
!     }
  
  }

Index: AMFMessage.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/AMFMessage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AMFMessage.java	9 Aug 2003 16:59:22 -0000	1.8
--- AMFMessage.java	15 Aug 2003 18:52:08 -0000	1.9
***************
*** 13,17 ****
  
  /**
!  *  
   * @author Jason Calabrese <[email protected]>
   * @author Pat Maddox <[email protected]>
--- 13,18 ----
  
  /**
!  * AMF Message
!  *
   * @author Jason Calabrese <[email protected]>
   * @author Pat Maddox <[email protected]>
***************
*** 21,79 ****
   */
  public class AMFMessage {
! 	// The headers
! 	protected List headers;
  
! 	// The body objects
! 	protected List bodies;
  
! 	public AMFMessage() {
! 		headers = new ArrayList();
! 		bodies = new ArrayList();
! 	}
  
! 	public void addHeader(String key, boolean required, Object value) {
! 		addHeader(new AMFHeader(key, required, value));
! 	}
  
! 	public void addHeader(AMFHeader header) {
! 		headers.add(header);
! 	}
  
! 	public int getHeaderCount() {
! 		return headers.size();
! 	}
  
! 	public AMFHeader getHeader(int index) {
! 		return (AMFHeader) headers.get(index);
! 	}
  
! 	public Iterator getHeaders() {
! 		return headers.iterator();
! 	}
  
! 	public void addBody(
! 		String target,
! 		String response,
! 		Object value,
! 		byte type) {
  
! 		addBody(new AMFBody(target, response, value, type));
! 	}
  
! 	public void addBody(AMFBody body) {
! 		bodies.add(body);
! 	}
  
! 	public int getBodyCount() {
! 		return bodies.size();
! 	}
  
! 	public AMFBody getBody(int index) {
! 		return (AMFBody) bodies.get(index);
! 	}
  
! 	public Iterator getBodies() {
! 		return bodies.iterator();
! 	}
  
  }
--- 22,111 ----
   */
  public class AMFMessage {
!     private static final int CURRENT_VERSION = 0;
  
!     /**
!      * version
!      */
!     protected int version;
!     /**
!      * The headers
!      */
!     protected List headers;
  
!     /**
!      * The body objects
!      */
!     protected List bodies;
  
!     public AMFMessage() {
!         version = CURRENT_VERSION;
!         headers = new ArrayList();
!         bodies = new ArrayList();
!     }
  
!     public void addHeader(String key, boolean required, Object value) {
!         addHeader(new AMFHeader(key, required, value));
!     }
  
!     public void addHeader(AMFHeader header) {
!         headers.add(header);
!     }
  
!     public int getHeaderCount() {
!         return headers.size();
!     }
  
!     public AMFHeader getHeader(int index) {
!         return (AMFHeader) headers.get(index);
!     }
  
!     public List getHeaders() {
!         return headers;
!     }
  
!     public void addBody(String target, String response, Object value, byte type) {
  
!         addBody(new AMFBody(target, response, value, type));
!     }
  
!     public void addBody(AMFBody body) {
!         bodies.add(body);
!     }
  
!     public int getBodyCount() {
!         return bodies.size();
!     }
  
!     public AMFBody getBody(int index) {
!         return (AMFBody) bodies.get(index);
!     }
! 
!     public Iterator getBodies() {
!         return bodies.iterator();
!     }
! 
!     public int getVersion() {
!         return version;
!     }
! 
!     public void setVersion(int version) {
!         this.version = version;
!     }
! 
!     /**
!      * AMFMessage content
!      * @return
!      */
!     public String toString() {
!         StringBuffer sb = new StringBuffer();
!         sb.append("[AmfMessage: {version=");
!         sb.append(version);
!         sb.append(", headers=");
!         sb.append(headers);
!         sb.append(", bodies=");
!         sb.append(bodies);
!         sb.append("}]");
!         return sb.toString();
!     }
  
  }

Index: ASObject.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/ASObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ASObject.java	9 Aug 2003 16:59:22 -0000	1.5
--- ASObject.java	15 Aug 2003 18:52:08 -0000	1.6
***************
*** 9,12 ****
--- 9,14 ----
  
  /**
+  * Base ASObject class
+  *
   * @author Jason Calabrese <[email protected]>
   * @version $Revision$, $Date$




-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01