[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla AgentInjector.java, 1.19, 1.20

[Chien-Liang Fok]

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

Modified Files:
	AgentInjector.java 
Log Message:
Modified BasicOpcodes to include bcast and forced_uart


Index: AgentInjector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/AgentInjector.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AgentInjector.java	20 Sep 2006 14:16:45 -0000	1.19
--- AgentInjector.java	27 Sep 2006 03:44:29 -0000	1.20
***************
*** 132,139 ****
  	 * @param createGUI Whether to create a GUI
  	 * @param debug Whether to be in debug mode
  	 * @throws Exception
  	 */
  	public AgentInjector(String source, boolean connect, int col,
! 						 boolean createGUI, boolean debug) throws Exception
  	{
  		this.source = source;
--- 132,140 ----
  	 * @param createGUI Whether to create a GUI
  	 * @param debug Whether to be in debug mode
+ 	 * @param nogw Whether to beacon the gateway
  	 * @throws Exception
  	 */
  	public AgentInjector(String source, boolean connect, int col,
! 						 boolean createGUI, boolean debug, boolean nogw) throws Exception
  	{
  		this.source = source;
***************
*** 142,146 ****
  		injector.registerListener(new AgillaNbrMsgJ(), this);
  		injector.registerListener(new AgillaAddressAckMsgJ(), this);
! 		new BaseStationHeartbeat();		
  		if (createGUI) gui = createSwingGUI(this);
  		if (connect && !injector.useRMI()) connect();
--- 143,148 ----
  		injector.registerListener(new AgillaNbrMsgJ(), this);
  		injector.registerListener(new AgillaAddressAckMsgJ(), this);
! 		if (!nogw)
! 			new BaseStationHeartbeat();		
  		if (createGUI) gui = createSwingGUI(this);
  		if (connect && !injector.useRMI()) connect();
***************
*** 528,531 ****
--- 530,534 ----
  			boolean debug = false;
  			boolean showGUI = true;
+ 			boolean nogw = false;
  			
  			/**
***************
*** 550,553 ****
--- 553,558 ----
  				else if (arg.equals("-d"))
  					debug = true;
+ 				else if (arg.equals("-nogw"))
+ 					nogw = true;
  				//else if (arg.equals("-dl")) 
  					//Debugger.debugLevel = Integer.valueOf(args[++index]).intValue();
***************
*** 571,575 ****
  				index++;
  			}
! 			AgentInjector ai = new AgentInjector(source, connect, numColumns, showGUI, debug);
  			
  			// load the plugins
--- 576,580 ----
  				index++;
  			}
! 			AgentInjector ai = new AgentInjector(source, connect, numColumns, showGUI, debug, nogw);
  			
  			// load the plugins
***************
*** 663,666 ****
--- 668,672 ----
  		System.err.println("\t-d for debug mode");
  		System.err.println("\t-nogui to hide the graphical user interface (for automated testing purposes)");
+ 		System.err.println("\t-nogw Stop the agent injector from beaconing the gateway.");
  		System.err.println("\t-plugin <name of plugin class> A plugin to load automatically upon startup.");
  	}