pyxida-cvs-commits

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

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

Modified Files:
	ExternalAPI.java ExternalAPIIF.java 
Log Message:
Fixed getRemoteCoords method

Index: ExternalAPIIF.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPIIF.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ExternalAPIIF.java	2 Jan 2007 21:41:34 -0000	1.13
--- ExternalAPIIF.java	3 Jan 2007 10:00:56 -0000	1.14
***************
*** 1,4 ****
--- 1,5 ----
  package edu.harvard.syrah.pyxida.api;
  
+ import java.util.Hashtable;
  import java.util.Map;
  import java.util.Vector;
***************
*** 17,21 ****
  	public void getRemoteCoord(String remoteNode, CB1<Map<String, Object>> cbRemoteCoord);
  
! 	public void getRemoteCoords(Map<String,Object> remoteNodes, CB1<Map<String, Object>> cbRemoteCoords);
  	
  	public void getLocalError(CB1<Double> cbLocalError);
--- 18,22 ----
  	public void getRemoteCoord(String remoteNode, CB1<Map<String, Object>> cbRemoteCoord);
  
! 	public void getRemoteCoords(Hashtable<String, Object> remoteNodes, CB1<Map<String, Object>> cbRemoteCoords);
  	
  	public void getLocalError(CB1<Double> cbLocalError);

Index: ExternalAPI.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPI.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ExternalAPI.java	2 Jan 2007 21:41:34 -0000	1.15
--- ExternalAPI.java	3 Jan 2007 10:00:56 -0000	1.16
***************
*** 153,162 ****
  	}
  
! 	public void getRemoteCoords(final Map<String,Object> remoteNodesMap, 
  															final CB1<Map<String, Object>> cbRemoteCoords) {
  		
  		String [] nodesStr = new String[remoteNodesMap.size()];
  		int i = 0;
! 		for (String remoteNode : remoteNodesMap.keySet()) {
        log.debug ("getRemoteCoords["+i+"]= "+remoteNode);
  			nodesStr[i] = remoteNode;
--- 153,163 ----
  	}
  
! 	public void getRemoteCoords(final Hashtable<String, Object> remoteNodesMap, 
  															final CB1<Map<String, Object>> cbRemoteCoords) {
  		
  		String [] nodesStr = new String[remoteNodesMap.size()];
  		int i = 0;
! 		for (Object obj : remoteNodesMap.keySet()) {
! 			String remoteNode = (String) obj;
        log.debug ("getRemoteCoords["+i+"]= "+remoteNode);
  			nodesStr[i] = remoteNode;