[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/eventlogger EventLoggerControl.java, 1.8, 1.8.4.1 EventLoggerSchema.java, 1.2, 1.2.4.1

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/eventlogger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8305/beta/SystemCore/java/net/tinyos/eventlogger

Modified Files:
      Tag: tos-1-1-8-candidate
	EventLoggerControl.java EventLoggerSchema.java 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: EventLoggerControl.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/eventlogger/EventLoggerControl.java,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** EventLoggerControl.java	1 Sep 2004 01:32:29 -0000	1.8
--- EventLoggerControl.java	11 Nov 2004 13:43:28 -0000	1.8.4.1
***************
*** 13,21 ****
    private EventLoggerSchema schema;
  
!   public EventLoggerControl(String filename) {
  
!     schema = new EventLoggerSchema(filename);
  
      moteIF = new MoteIF((Messenger)null);
      mhConnector = new MultihopConnector();
      mhConnector.registerListener(LogEntryMsg.AM_TYPE, this);
--- 13,24 ----
    private EventLoggerSchema schema;
  
!   public EventLoggerControl() {
!     moteIF = new MoteIF((Messenger)null);
!   }
  
!   public EventLoggerControl(String filename) {
  
      moteIF = new MoteIF((Messenger)null);
+     schema = new EventLoggerSchema(filename);
      mhConnector = new MultihopConnector();
      mhConnector.registerListener(LogEntryMsg.AM_TYPE, this);
***************
*** 23,27 ****
  
    public void play(int nodeID, int speed) {
!     DripMsg dripMsg = new DripMsg();
      dripMsg.set_metadata_id((short)EventLoggerCmdMsg.AM_TYPE);
      dripMsg.set_metadata_seqno((byte)0);
--- 26,33 ----
  
    public void play(int nodeID, int speed) {
!     DripMsg dripMsg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE +
! 				  NamingMsg.DEFAULT_MESSAGE_SIZE +
! 				  EventLoggerCmdMsg.DEFAULT_MESSAGE_SIZE);
! 
      dripMsg.set_metadata_id((short)EventLoggerCmdMsg.AM_TYPE);
      dripMsg.set_metadata_seqno((byte)0);
***************
*** 59,63 ****
    private void sendCommand(int nodeID, int commandID) {
  
!     DripMsg dripMsg = new DripMsg();
      dripMsg.set_metadata_id((short)EventLoggerCmdMsg.AM_TYPE); 
      dripMsg.set_metadata_seqno((byte)0);
--- 65,72 ----
    private void sendCommand(int nodeID, int commandID) {
  
!     DripMsg dripMsg = new DripMsg(DripMsg.DEFAULT_MESSAGE_SIZE + 
! 				  NamingMsg.DEFAULT_MESSAGE_SIZE +
! 				  EventLoggerCmdMsg.DEFAULT_MESSAGE_SIZE);
! 
      dripMsg.set_metadata_id((short)EventLoggerCmdMsg.AM_TYPE); 
      dripMsg.set_metadata_seqno((byte)0);

Index: EventLoggerSchema.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/eventlogger/EventLoggerSchema.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** EventLoggerSchema.java	7 Sep 2004 22:15:39 -0000	1.2
--- EventLoggerSchema.java	11 Nov 2004 13:43:28 -0000	1.2.4.1
***************
*** 13,26 ****
    private HashMap schemaEntries = new HashMap();
  
!   private void processSchemaEntry(String line) {
!     String[] tokens = line.split("\\s+",2);
! 	
!     int key = Integer.parseInt(tokens[0]);
!     String text = tokens[1].substring(1, tokens[1].length()-1);
!     System.err.println("" + key + " (" + text + ")");
!     
!     SchemaEntry se = new SchemaEntry(key, text);
!     schemaEntries.put(new Integer(key), se);
!     parseText(text);
    }
  
--- 13,18 ----
    private HashMap schemaEntries = new HashMap();
  
!   public EventLoggerSchema(String filename) {
!     readSchema(filename);
    }
  
***************
*** 36,44 ****
    }
  
!   EventLoggerSchema(String filename) {
!     readSchema(filename);
!   }
! 
!   void parseText(String text) {
    }
  
--- 28,41 ----
    }
  
!   private void processSchemaEntry(String line) {
!     String[] tokens = line.split("\\s+",2);
! 	
!     int key = Integer.parseInt(tokens[0]);
!     String text = tokens[1].substring(1, tokens[1].length()-1);
!     System.err.println("" + key + " (" + text + ")");
!     
!     SchemaEntry se = new SchemaEntry(key, text);
!     schemaEntries.put(new Integer(key), se);
!     //    parseText(text);
    }
  
***************
*** 92,96 ****
    }
  
- 
    private int ubyte(LogEntryMsg m,
  		    int offset) {
--- 89,92 ----