[Arianne-commits] marauroa/src/marauroa/common/net Decoder.java, 1.1, 1.2 Encoder.java, 1.1, 1.2 Message.java, 1.5, 1.6

[Miguel A. B. L. <ari...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/common/net
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17421/src/marauroa/common/net

Modified Files:
	Decoder.java Encoder.java Message.java 
Log Message:
This version of Marauroa should work as last working version.

Index: Encoder.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/Encoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Encoder.java	17 Dec 2006 21:50:44 -0000	1.1
--- Encoder.java	14 Jan 2007 19:20:04 -0000	1.2
***************
*** 4,8 ****
  import java.io.IOException;
  
! 
  public class Encoder {
  	private Encoder() {		
--- 4,12 ----
  import java.io.IOException;
  
! /**
!  * This class encode a Message as a stream of bytes.
!  * Encoder follows singleton pattern.
!  * @author miguel
!  */
  public class Encoder {
  	private Encoder() {		
***************
*** 10,13 ****
--- 14,18 ----
  	
  	private static Encoder instance;
+ 	
  	public static Encoder get() {
  		if(instance==null) {
***************
*** 18,21 ****
--- 23,32 ----
  	}
  	
+ 	/** 
+ 	 * This method encodes using the Marauroa protocol a Message as a stream of bytes.
+ 	 * @param msg The message to encode
+ 	 * @return a byte array 
+ 	 * @throws IOException if there is any error encoding the message.
+ 	 */
  	public byte[] encode(Message msg) throws IOException {
  		int size=0;

Index: Decoder.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/Decoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Decoder.java	17 Dec 2006 21:50:44 -0000	1.1
--- Decoder.java	14 Jan 2007 19:20:04 -0000	1.2
***************
*** 6,9 ****
--- 6,14 ----
  
  
+ /**
+  * This class decode a stream of bytes and build a Marauroa message with it.
+  * Decoder follow singleton pattern.
+  * @author miguel
+  */
  public class Decoder {
  	private Map<InetSocketAddress,byte[]> content;
***************
*** 13,16 ****
--- 18,22 ----
  	
  	private static Decoder instance;
+ 	
  	public static Decoder get() {
  		if(instance==null) {

Index: Message.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/Message.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Message.java	20 Aug 2006 15:40:13 -0000	1.5
--- Message.java	14 Jan 2007 19:20:04 -0000	1.6
***************
*** 24,28 ****
  
  	public enum MessageType {
! 		C2S_ACTION, C2S_CHOOSECHARACTER, C2S_LOGIN_REQUESTKEY, C2S_LOGIN_SENDNONCENAMEANDPASSWORD, C2S_LOGIN_SENDPROMISE, C2S_LOGOUT, C2S_OUTOFSYNC, C2S_PERCEPTION_ACK, C2S_TRANSFER_ACK, S2C_ACTION_ACK, S2C_CHARACTERLIST, S2C_CHOOSECHARACTER_ACK, S2C_CHOOSECHARACTER_NACK, S2C_INVALIDMESSAGE, S2C_LOGIN_ACK, S2C_LOGIN_NACK, S2C_LOGIN_SENDKEY, S2C_LOGIN_SENDNONCE, S2C_LOGOUT_ACK, S2C_LOGOUT_NACK, S2C_PERCEPTION, S2C_SERVERINFO, S2C_TRANSFER, S2C_TRANSFER_REQ, C2S_CREATEACCOUNT, S2C_CREATEACCOUNT_ACK, S2C_CREATEACCOUNT_NACK
  	}
  
--- 24,54 ----
  
  	public enum MessageType {
! 		C2S_ACTION, 
! 		C2S_CHOOSECHARACTER, 
! 		C2S_LOGIN_REQUESTKEY, 
! 		C2S_LOGIN_SENDNONCENAMEANDPASSWORD, 
! 		C2S_LOGIN_SENDPROMISE, 
! 		C2S_LOGOUT, 
! 		C2S_OUTOFSYNC, 
! 		C2S_PERCEPTION_ACK, 
! 		C2S_TRANSFER_ACK, 
! 		S2C_ACTION_ACK, 
! 		S2C_CHARACTERLIST, 
! 		S2C_CHOOSECHARACTER_ACK, 
! 		S2C_CHOOSECHARACTER_NACK, 
! 		S2C_INVALIDMESSAGE, 
! 		S2C_LOGIN_ACK, 
! 		S2C_LOGIN_NACK, 
! 		S2C_LOGIN_SENDKEY, 
! 		S2C_LOGIN_SENDNONCE, 
! 		S2C_LOGOUT_ACK, 
! 		S2C_LOGOUT_NACK, 
! 		S2C_PERCEPTION, 
! 		S2C_SERVERINFO, 
! 		S2C_TRANSFER, 
! 		S2C_TRANSFER_REQ, 
! 		C2S_CREATEACCOUNT, 
! 		S2C_CREATEACCOUNT_ACK, 
! 		S2C_CREATEACCOUNT_NACK
  	}