[Swift-commit] r4502 - in trunk/src/org/griphyn/vdl: karajan/lib mapping

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2011-05-19 22:36:04 -0500 (Thu, 19 May 2011)
New Revision: 4502

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
   trunk/src/org/griphyn/vdl/mapping/DSHandle.java
Log:
Minor readability changes


Modified: trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java	2011-05-20 03:32:49 UTC (rev 4501)
+++ trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java	2011-05-20 03:36:04 UTC (rev 4502)
@@ -463,18 +463,17 @@
 	}
 
 	private void closeDeep(VariableStack stack, DSHandle handle,
-            WrapperMap hash) throws InvalidPathException, ExecutionException {
+	                       WrapperMap wrapperMap)  
+	throws InvalidPathException, ExecutionException {
 	    handle.closeShallow();
-	    hash.close(handle);
+	    wrapperMap.close(handle);
 	    try {
-            // Mark all leaves
-            Iterator it = handle.getFields(Path.CHILDREN).iterator();
-            while (it.hasNext()) {
-                closeDeep(stack, (DSHandle) it.next(), hash);
-            }
+            // Mark all children	
+            for (DSHandle child : handle.getFields(Path.CHILDREN))
+                 closeDeep(stack, child, wrapperMap);
         }
         catch (HandleOpenException e) {
-            throw new ExecutionException("Handle open in closeChildren",e);
+            throw new ExecutionException("Handle open in closeChildren", e);
         }
     }
 

Modified: trunk/src/org/griphyn/vdl/mapping/DSHandle.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/DSHandle.java	2011-05-20 03:32:49 UTC (rev 4501)
+++ trunk/src/org/griphyn/vdl/mapping/DSHandle.java	2011-05-20 03:36:04 UTC (rev 4502)
@@ -48,7 +48,7 @@
      *
      *  @return a Collection of DSHandle objects
      */
-    public Collection getFields(Path path) throws InvalidPathException, HandleOpenException;
+    public Collection<DSHandle> getFields(Path path) throws InvalidPathException, HandleOpenException;
 
     public Object getValue();