[Tinyos-2-commits] CVS: tinyos-2.x/support/sdk/java/net/tinyos/message Message.java, 1.3, 1.4 MessageListener.java, 1.2, 1.3 MoteIF.java, 1.2, 1.3 Receiver.java, 1.2, 1.3 Sender.java, 1.2, 1.3

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/message
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22851/support/sdk/java/net/tinyos/message

Modified Files:
	Message.java MessageListener.java MoteIF.java Receiver.java 
	Sender.java 
Log Message:
Merge over into the trunk.


Index: Message.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/message/Message.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Message.java	18 Aug 2006 21:05:57 -0000	1.3
--- Message.java	7 Nov 2006 19:30:41 -0000	1.4
***************
*** 90,97 ****
       * @param data_length The size of the message to create.
       */
!     protected Message(int data_length) {
  	init(data_length);
      }
!     protected void init(int data_length) {
  	init(new byte[data_length]);
      }
--- 90,97 ----
       * @param data_length The size of the message to create.
       */
!     public Message(int data_length) {
  	init(data_length);
      }
!     public void init(int data_length) {
  	init(new byte[data_length]);
      }
***************
*** 103,107 ****
       * @param base_offset The base offset into the newly created message.
       */
!     protected Message(int data_length, int base_offset) {
        init(data_length, base_offset);
      }
--- 103,107 ----
       * @param base_offset The base offset into the newly created message.
       */
!     public Message(int data_length, int base_offset) {
        init(data_length, base_offset);
      }
***************
*** 115,119 ****
       * @param data the storage for this message
       */
!     protected Message(byte[] data) {
  	init(data);
      }
--- 115,119 ----
       * @param data the storage for this message
       */
!     public Message(byte[] data) {
  	init(data);
      }
***************
*** 129,133 ****
       * @param base_offset the base offset into the data array
       */
!     protected Message(byte[] data, int base_offset) {
  	init(data, base_offset);
      }
--- 129,133 ----
       * @param base_offset the base offset into the data array
       */
!     public Message(byte[] data, int base_offset) {
  	init(data, base_offset);
      }
***************
*** 144,148 ****
       * @param data_length the length of the message data
       */
!     protected Message(byte[] data, int base_offset, int data_length) {
  	init(data, base_offset, data_length);
      }
--- 144,148 ----
       * @param data_length the length of the message data
       */
!     public Message(byte[] data, int base_offset, int data_length) {
  	init(data, base_offset, data_length);
      }
***************
*** 162,166 ****
       * @param data_length the length of the message data
       */
!     protected Message(Message msg, int base_offset, int data_length) {
  	init(msg, base_offset, data_length);
      }
--- 162,166 ----
       * @param data_length the length of the message data
       */
!     public Message(Message msg, int base_offset, int data_length) {
  	init(msg, base_offset, data_length);
      }
***************
*** 214,218 ****
       */
      public void dataSet(byte[] data) {
! 	dataSet(data, 0, 0, Math.min(this.data_length, data.length));
      }
  
--- 214,218 ----
       */
      public void dataSet(byte[] data) {
! 	dataSet(data, 0, this.base_offset, Math.min(this.data_length, data.length));
      }
  



Index: Receiver.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/message/Receiver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Receiver.java	12 Jul 2006 16:59:56 -0000	1.2
--- Receiver.java	7 Nov 2006 19:30:41 -0000	1.3
***************
*** 184,188 ****
  		continue;
  	    }
! 	    temp.listener.messageReceived(msg.get_header_addr(), received);
  	}
      }
--- 184,188 ----
  		continue;
  	    }
! 	    temp.listener.messageReceived(msg.get_header_dest(), received);
  	}
      }

Index: Sender.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/message/Sender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sender.java	12 Jul 2006 16:59:56 -0000	1.2
--- Sender.java	7 Nov 2006 19:30:41 -0000	1.3
***************
*** 86,90 ****
  	SerialPacket packet =
  	    new SerialPacket(SerialPacket.offset_data(0) + data.length);
! 	packet.set_header_addr(moteId);
  	packet.set_header_type((short)amType);
  	packet.set_header_length((short)data.length);
--- 86,90 ----
  	SerialPacket packet =
  	    new SerialPacket(SerialPacket.offset_data(0) + data.length);
! 	packet.set_header_dest(moteId);
  	packet.set_header_type((short)amType);
  	packet.set_header_length((short)data.length);