[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/api ExternalAPI.java, 1.2, 1.3 ExternalAPIIF.java, 1.4, 1.5

[Peter P. <pr...@us...>]

Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27080/src/edu/harvard/syrah/pyxida/api

Modified Files:
	ExternalAPI.java ExternalAPIIF.java 
Log Message:
Fixed external API definition

Index: ExternalAPIIF.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPIIF.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExternalAPIIF.java	30 Nov 2006 18:47:17 -0000	1.4
--- ExternalAPIIF.java	1 Dec 2006 17:14:57 -0000	1.5
***************
*** 11,19 ****
  	 * of either a substrate node or a local proxy node
  	 */
! 	public List<Double> getLocalCoord();
  	
! 	public List<Double> getRemoteCoord(String remoteNode);
  	
! 	public double getLocalError();
  
  	// Estimate the RTT
--- 11,19 ----
  	 * of either a substrate node or a local proxy node
  	 */
! 	public void getLocalCoord(CB1<List<Double>> cbLocalCoord);
  	
! 	public void getRemoteCoord(String remoteNode, CB1<List<Double>> cbRemoteCoord);
  	
! 	public void getLocalError(CB1<Double> cbLocalError);
  
  	// Estimate the RTT

Index: ExternalAPI.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExternalAPI.java	1 Dec 2006 15:31:28 -0000	1.2
--- ExternalAPI.java	1 Dec 2006 17:14:57 -0000	1.3
***************
*** 52,56 ****
  	}
  
! 	public List<Double> getLocalCoord() {
  		Coordinate coord = ncManager.getLocalCoord();
  		List<Double> listCoord = new ArrayList<Double>();
--- 52,56 ----
  	}
  
! 	public void getLocalCoord(CB1<List<Double>> cbLocalCoord) {
  		Coordinate coord = ncManager.getLocalCoord();
  		List<Double> listCoord = new ArrayList<Double>();
***************
*** 59,71 ****
  			listCoord.add(c[i]);
  		}
! 		return listCoord;
  	}
  
! 	public List<Double> getRemoteCoord(String remoteNode) {
  		throw new UnsupportedOperationException();
  	}
  	
! 	public double getLocalError() {
! 		return ncManager.getLocalError();
  	}
  
--- 59,71 ----
  			listCoord.add(c[i]);
  		}
! 		cbLocalCoord.call(CBResult.OK(), listCoord);
  	}
  
! 	public void getRemoteCoord(String remoteNode, CB1<List<Double>> cbRemoteCoord) {
  		throw new UnsupportedOperationException();
  	}
  	
! 	public void getLocalError(CB1<Double> cbLocalError) {
! 		cbLocalError.call(CBResult.OK(), ncManager.getLocalError());
  	}