[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/messages AgillaNbrMsgJ.java, 1.5, 1.5.2.1 AgillaSetBSMsgJ.java, 1.3, 1.3.4.1

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/messages
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27275/edu/wustl/mobilab/agilla/messages

Modified Files:
      Tag: GroupComm
	AgillaNbrMsgJ.java AgillaSetBSMsgJ.java 
Log Message:
Added a proxy heart beat and a virtual ID for the proxy.

Index: AgillaNbrMsgJ.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/messages/AgillaNbrMsgJ.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** AgillaNbrMsgJ.java	5 Apr 2006 10:28:19 -0000	1.5
--- AgillaNbrMsgJ.java	15 Nov 2006 04:30:39 -0000	1.5.2.1
***************
*** 50,54 ****
   */
  public class AgillaNbrMsgJ implements MessageJ, AgillaConstants {
! 	private Vector neighbors = new Vector();
  	private static final int AGILLA_NBR_MSG_SIZE = AgillaNbrMsg.numElements_nbr();
  	
--- 50,54 ----
   */
  public class AgillaNbrMsgJ implements MessageJ, AgillaConstants {
! 	private Vector<Address> neighbors = new Vector<Address>();
  	private static final int AGILLA_NBR_MSG_SIZE = AgillaNbrMsg.numElements_nbr();
  	
***************
*** 93,97 ****
  	
  	
! 	public Vector getNbrs() {
  		return neighbors;
  	}
--- 93,97 ----
  	
  	
! 	public Vector<Address> getNbrs() {
  		return neighbors;
  	}

Index: AgillaSetBSMsgJ.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/messages/AgillaSetBSMsgJ.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** AgillaSetBSMsgJ.java	11 Nov 2005 02:15:49 -0000	1.3
--- AgillaSetBSMsgJ.java	15 Nov 2006 04:30:39 -0000	1.3.4.1
***************
*** 56,63 ****
   */
  public class AgillaSetBSMsgJ  implements MessageJ, AgillaConstants {
! 	public AgillaSetBSMsgJ() {
  	}
  
  	public AgillaSetBSMsgJ(AgillaSetBSMsg m) {
  	}
  
--- 56,67 ----
   */
  public class AgillaSetBSMsgJ  implements MessageJ, AgillaConstants {
! 	int vID;
! 	
! 	public AgillaSetBSMsgJ(int vID) {
! 		this.vID = vID;
  	}
  
  	public AgillaSetBSMsgJ(AgillaSetBSMsg m) {
+ 		this.vID = m.get_vID();
  	}
  
***************
*** 68,76 ****
  
  	public net.tinyos.message.Message toTOSMsg() {
! 		return new AgillaSetBSMsg();
  	}
  
  	public String toString() {
! 		return "SET BS MESSAGE";
  	}
  }
--- 72,82 ----
  
  	public net.tinyos.message.Message toTOSMsg() {
! 		AgillaSetBSMsg m = new AgillaSetBSMsg();
! 		m.set_vID(vID);
! 		return m;
  	}
  
  	public String toString() {
! 		return "SET BS MESSAGE " + vID;
  	}
  }