[Arianne-commits] marauroa/src/marauroa/common/net Encoder.java, 1.9, 1.10 OutputSerializer.java, 1.13, 1.14 MessageFactory.java, 1.43, 1.44 InputSerializer.java, 1.15, 1.16

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/common/net
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5510/src/marauroa/common/net

Modified Files:
	Encoder.java OutputSerializer.java MessageFactory.java 
	InputSerializer.java 
Log Message:
made protocolVersion available in InputSerializer and OutputSerializer

Index: OutputSerializer.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/OutputSerializer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OutputSerializer.java	27 May 2010 18:51:53 -0000	1.13
--- OutputSerializer.java	11 Jun 2010 19:00:57 -0000	1.14
***************
*** 24,27 ****
--- 24,28 ----
  
  	private OutputStream out;
+ 	private int protocolVersion = NetConst.NETWORK_PROTOCOL_VERSION;
  
  	/**
***************
*** 234,236 ****
--- 235,255 ----
  		}	    
      }
+ 
+ 	/**
+ 	 * gets the protocolVersion
+ 	 *
+ 	 * @return protocol version
+ 	 */
+ 	public int getProtocolVersion() {
+     	return protocolVersion;
+     }
+ 
+ 	/**
+ 	 * sets the protocol version
+ 	 *
+ 	 * @param protocolVersion protocol version
+ 	 */
+ 	public void setProtocolVersion(int protocolVersion) {
+     	this.protocolVersion = protocolVersion;
+     }
  };

Index: Encoder.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/Encoder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Encoder.java	14 May 2010 19:38:11 -0000	1.9
--- Encoder.java	11 Jun 2010 19:00:57 -0000	1.10
***************
*** 63,66 ****
--- 63,67 ----
  		ByteArrayOutputStream out = new ByteArrayOutputStream();
  		OutputSerializer s = new OutputSerializer(out);
+ 		s.setProtocolVersion(msg.getProtocolVersion());
  
  		/*

Index: InputSerializer.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/InputSerializer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** InputSerializer.java	27 May 2010 19:13:32 -0000	1.15
--- InputSerializer.java	11 Jun 2010 19:00:57 -0000	1.16
***************
*** 26,29 ****
--- 26,31 ----
  
  	private InputStream in;
+ 	private int protocolVersion = NetConst.NETWORK_PROTOCOL_VERSION;
+ 
  
  	/**
***************
*** 346,348 ****
--- 348,369 ----
  		in.close();
  	}
+ 
+ 
+ 	/**
+ 	 * gets the protocolVersion
+ 	 *
+ 	 * @return protocol version
+ 	 */
+ 	public int getProtocolVersion() {
+     	return protocolVersion;
+     }
+ 
+ 	/**
+ 	 * sets the protocol version
+ 	 *
+ 	 * @param protocolVersion protocol version
+ 	 */
+ 	public void setProtocolVersion(int protocolVersion) {
+     	this.protocolVersion = protocolVersion;
+     }
  }

Index: MessageFactory.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/MessageFactory.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** MessageFactory.java	24 May 2010 22:16:55 -0000	1.43
--- MessageFactory.java	11 Jun 2010 19:00:57 -0000	1.44
***************
*** 209,212 ****
--- 209,213 ----
  				}
  				InputSerializer s = new InputSerializer(in);
+ 				s.setProtocolVersion(networkProtocolVersion);
  
  				tmp.readObject(s);