[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain Drain.java, 1.3, 1.4 Makefile, 1.1, 1.2

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8285/tools/java/net/tinyos/drain

Modified Files:
	Drain.java Makefile 
Log Message:
Removed DrainRegisterMsg from Drain java tools dependencies

Index: Drain.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/Drain.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Drain.java	27 Apr 2005 00:21:27 -0000	1.3
--- Drain.java	12 Jun 2005 13:38:03 -0000	1.4
***************
*** 8,12 ****
  import java.util.*;
  
! public class Drain implements MessageListener {
  
    private static boolean DEBUG = false;
--- 8,12 ----
  import java.util.*;
  
! public class Drain {
  
    private static boolean DEBUG = false;
***************
*** 25,29 ****
      spAddr = DrainLib.setSPAddr();
      moteIF = DrainLib.startMoteIF();
-     moteIF.registerListener(new DrainRegisterMsg(), this);
      moteIF.registerListener(new DrainMsg(), new DrainListener());
    }
--- 25,28 ----
***************
*** 59,62 ****
--- 58,62 ----
    }
  
+ /*
    public void send(int to, int type, Message m, int size) {
      
***************
*** 127,130 ****
--- 127,131 ----
      }
    }
+ */
    
    private class DrainListener implements MessageListener {
***************
*** 143,147 ****
      }
    }
!   
    public synchronized void send(Message m) {
      sendTo(MoteIF.TOS_BCAST_ADDR, m);
--- 144,149 ----
      }
    }
! 
! 
    public synchronized void send(Message m) {
      sendTo(MoteIF.TOS_BCAST_ADDR, m);
***************
*** 172,176 ****
      int treeInstance = (int)((double)Math.random() * (double)255);
  
- 
      System.err.println("Drain Tree Builder");
      System.err.println("myAddr = " + DrainLib.setSPAddr() + 
--- 174,177 ----

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	15 Mar 2005 01:19:13 -0000	1.1
--- Makefile	12 Jun 2005 13:38:03 -0000	1.2
***************
*** 7,11 ****
  
  # List of message classes to build
! MSGS = DrainMsg.java DrainBeaconMsg.java DrainRegisterMsg.java DrainConsts.java
  CONSTS = 
  INITIAL_TARGETS = $(MSGS) $(CONSTS)
--- 7,11 ----
  
  # List of message classes to build
! MSGS = DrainMsg.java DrainBeaconMsg.java DrainConsts.java
  CONSTS = 
  INITIAL_TARGETS = $(MSGS) $(CONSTS)
***************
*** 21,27 ****
  	$(MIG) -java-classname=$(PACKAGE).DrainBeaconMsg $(BETA)/Drain/Drain.h DrainBeaconMsg -o $@
  
- DrainRegisterMsg.java: $(BETA)/Drain/Drain.h
- 	$(MIG) -java-classname=$(PACKAGE).DrainRegisterMsg $(BETA)/Drain/Drain.h DrainRegisterMsg -o $@
- 
  DrainConsts.java: $(BETA)/Drain/Drain.h
  	$(NCG) -java-classname=$(PACKAGE).DrainConsts -I$(BETA)/Drain $(BETA)/Drain/Drain.h Drain.h -o $@
--- 21,24 ----