[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla Injector.java, 1.5, 1.6 LocationManager.java, 1.22, 1.23 SwingAgentInjectorGUI.java, 1.10, 1.11

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

Modified Files:
	Injector.java LocationManager.java SwingAgentInjectorGUI.java 
Log Message:


Index: Injector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/Injector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Injector.java	5 Apr 2006 10:28:21 -0000	1.5
--- Injector.java	19 May 2006 20:07:44 -0000	1.6
***************
*** 63,67 ****
  			ts = new TupleSpace(sni);
  			new TimeSync(sni);
! 			locMgr = new LocationManager(sni);
  			//new SimpleTestAgent();     // debug
  		}
--- 63,68 ----
  			ts = new TupleSpace(sni);
  			new TimeSync(sni);
! 			if (AgillaProperties.enableClustering())
! 				locMgr = new LocationManager(sni);
  			//new SimpleTestAgent();     // debug
  		}

Index: LocationManager.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/LocationManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** LocationManager.java	1 May 2006 16:09:01 -0000	1.22
--- LocationManager.java	19 May 2006 20:07:44 -0000	1.23
***************
*** 1396,1404 ****
  		}
  		
! 		public void sendReply(){
  			timer.cancel();
  			queryHandler.sendReply(this);
  		}
! 	}
  	
  	class IllegalOperationException extends Exception {
--- 1396,1404 ----
[...1143 lines suppressed...]
! 	}
  
  	/*
--- 2480,2495 ----
  			this.sni = sni;
  			sni.registerListener(new AgillaClusterDebugMsgJ(), this);
! 			dbg("Started!");
  		}
  
  		public void messageReceived(int dest, MessageJ msg) 
  		{
! 			perr("------------------Received cluster debug message------------------------\n" + msg);
  			
  		}
! 		
! 		private void dbg(String msg) { 	debug("ClusterDebugMsgHandler: " + msg); }
! 		private void perr(String msg) { print("ClusterDebugMsgHandler: " + msg); }
! 	} // ClusterDebugMsgHandler
  
  	/*

Index: SwingAgentInjectorGUI.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/SwingAgentInjectorGUI.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SwingAgentInjectorGUI.java	5 Apr 2006 10:28:21 -0000	1.10
--- SwingAgentInjectorGUI.java	19 May 2006 20:07:44 -0000	1.11
***************
*** 468,471 ****
--- 468,482 ----
  
  			if (file != null) {
+ 				if (!file.exists()) {
+                     try {
+                         file.createNewFile();
+                     } catch(IOException e) {
+                         e.printStackTrace();
+                         JOptionPane.showMessageDialog(null,
+                                   "Cannot create the file.", "Error",
+                                   JOptionPane.ERROR_MESSAGE);
+                         return;
+                     }                    
+                 }				
  				if (file.canWrite()) {
  					filename = file.getName();