[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/plugins AgentGroupCommMgr.java, 1.1, 1.2

[Chien-Liang Fok]

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

Modified Files:
	AgentGroupCommMgr.java 
Log Message:
Modified to support dynamic leader injection

Index: AgentGroupCommMgr.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/plugins/AgentGroupCommMgr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AgentGroupCommMgr.java	25 May 2006 02:33:26 -0000	1.1
--- AgentGroupCommMgr.java	27 Sep 2006 04:35:57 -0000	1.2
***************
*** 7,12 ****
  
  public class AgentGroupCommMgr extends Plugin implements ReactionListener, AgillaConstants {
! 	private static final String LEADER_FILE 
! 		= "C:\\Program Files\\UCB\\cygwin\\opt\\tinyos-1.x\\contrib\\wustl\\apps\\AgillaAgents\\GroupComm\\4-dynamic-leader\\leader.ma";
  	
  	AgentInjector injector;
--- 7,12 ----
  
  public class AgentGroupCommMgr extends Plugin implements ReactionListener, AgillaConstants {
! 	private String leader_file
! 		= "C:\\Program Files\\cygwin\\opt\\tinyos-1.x\\contrib\\wustl\\apps\\AgillaAgents\\GroupComm\\chat\\Leader.ma";
  	
  	AgentInjector injector;
***************
*** 16,26 ****
  	String leaderString = "";
  	
! 	public AgentGroupCommMgr(AgentInjector injector) {
  		this.injector = injector;
  		this.ts = injector.getTS();
  	
  		// read in the leader agent
  		try {
! 			File f = new File(LEADER_FILE);
  			BufferedReader reader = new BufferedReader(new FileReader(f));
  			String nxtLine = reader.readLine();
--- 16,38 ----
  	String leaderString = "";
  	
! 	public AgentGroupCommMgr(AgentInjector injector, String [] args) {
  		this.injector = injector;
  		this.ts = injector.getTS();
  	
+ 		try {
+ 			for (int i = 0; i < args.length; i++) {
+ 				if (args[i].equals("-leader")) {
+ 					this.leader_file = args[++i];
+ 				}
+ 				else throw new Exception("Unknown parameter: " + args[i]);
+ 			}
+ 		} catch(Exception e) {
+ 			e.printStackTrace();
+ 			System.exit(1);
+ 		}
+ 		
  		// read in the leader agent
  		try {
! 			File f = new File(leader_file);
  			BufferedReader reader = new BufferedReader(new FileReader(f));
  			String nxtLine = reader.readLine();