[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla Injector.java, 1.6, 1.7 AgentInjector.java, 1.17, 1.18 AgillaProperties.java, 1.9, 1.10 LocationManager.java, 1.23, NONE

[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-serv32010/edu/wustl/mobilab/agilla

Modified Files:
	Injector.java AgentInjector.java AgillaProperties.java 
Removed Files:
	LocationManager.java 
Log Message:
Removed clustering code.

Index: Injector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/Injector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Injector.java	19 May 2006 20:07:44 -0000	1.6
--- Injector.java	26 May 2006 01:27:08 -0000	1.7
***************
*** 53,57 ****
  	private AgentInjectorRMI injectorRMI;
  	private String rmihost;
- 	private LocationManager locMgr = null;
  
      public Injector(String source) throws Exception {
--- 53,56 ----
***************
*** 63,68 ****
  			ts = new TupleSpace(sni);
  			new TimeSync(sni);
- 			if (AgillaProperties.enableClustering())
- 				locMgr = new LocationManager(sni);
  			//new SimpleTestAgent();     // debug
  		}
--- 62,65 ----
***************
*** 100,107 ****
  		sendMsg(new AgillaResetMsgJ(TOS_UART_ADDRESS, address));
  	}
- 	
- 	public LocationManager getLocMgr(){
- 		return locMgr;
- 	}
  
  	public void registerListener(MessageJ msg, MessageListenerJ listener) {
--- 97,100 ----

Index: AgentInjector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/AgentInjector.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AgentInjector.java	25 May 2006 02:33:26 -0000	1.17
--- AgentInjector.java	26 May 2006 01:27:08 -0000	1.18
***************
*** 357,363 ****
  		injector.reset(addr);
  		
- 		if (AgillaProperties.enableClustering())
- 			injector.getLocMgr().reset(addr);
- 		
  		// reset all of the plugins
  		for (int i = 0; i < plugins.size(); i++) {
--- 357,360 ----

Index: AgillaProperties.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/AgillaProperties.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AgillaProperties.java	5 Apr 2006 23:57:24 -0000	1.9
--- AgillaProperties.java	26 May 2006 01:27:08 -0000	1.10
***************
*** 50,58 ****
  	private static final String DEFAULT_RUN_TEST = "false";
  	private static final String DEFAULT_NUM_COL = "20";
- 	private static final String DEFAULT_ENABLE_CLUSTERING = "false";
  	private static final String DEFAULT_NETWORK_NAME = "unk";
  	private static String initDir, defaultAgent, nwName;
  	private static int numCol;
! 	private static boolean runTest, enableClustering;
  	
  	private AgillaProperties() {
--- 50,57 ----
  	private static final String DEFAULT_RUN_TEST = "false";
  	private static final String DEFAULT_NUM_COL = "20";
  	private static final String DEFAULT_NETWORK_NAME = "unk";
  	private static String initDir, defaultAgent, nwName;
  	private static int numCol;
! 	private static boolean runTest;
  	
  	private AgillaProperties() {
***************
*** 62,66 ****
  		runTest = Boolean.valueOf(DEFAULT_RUN_TEST).booleanValue();
  		numCol = Integer.valueOf(DEFAULT_NUM_COL).intValue();
- 		enableClustering = Boolean.valueOf(DEFAULT_ENABLE_CLUSTERING).booleanValue();
  		nwName = DEFAULT_NETWORK_NAME;
  		try {
--- 61,64 ----
***************
*** 79,83 ****
  			runTest = Boolean.valueOf(getProperty("runTest", DEFAULT_RUN_TEST)).booleanValue();
  			numCol = Integer.valueOf(getProperty("numCol", DEFAULT_NUM_COL)).intValue();
- 			enableClustering = Boolean.valueOf(getProperty("enableClustering", DEFAULT_ENABLE_CLUSTERING)).booleanValue();
  			nwName = getProperty("nwName", DEFAULT_NETWORK_NAME);
  		} catch(Exception e) {
--- 77,80 ----
***************
*** 94,101 ****
  	}
  	
- 	public static boolean enableClustering() {
- 		return enableClustering;
- 	}
- 	
  	public static String networkName(){
  		return nwName;
--- 91,94 ----

--- LocationManager.java DELETED ---