[Swift-commit] r3466 - trunk/src/org/griphyn/vdl/mapping

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2010-07-23 23:16:02 -0500 (Fri, 23 Jul 2010)
New Revision: 3466

Modified:
   trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java
   trunk/src/org/griphyn/vdl/mapping/RootDataNode.java
Log:
renamed slightly misleading method

Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2010-07-22 22:09:52 UTC (rev 3465)
+++ trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2010-07-24 04:16:02 UTC (rev 3466)
@@ -516,19 +516,20 @@
             }
         }
     }
-
-    /** Recursively closes arrays through a tree of arrays and complex
- 	    types. */
-    public void closeDeepStructure() {
+	
+	/**
+     * Recursively closes arrays through a tree of arrays and complex types.
+     */
+    public void closeArraySizes() {
         if (!this.closed && this.getType().isArray()) {
             closeShallow();
         }
         synchronized (handles) {
             for (DSHandle handle : handles.values()) {
                 AbstractDataNode child = (AbstractDataNode) handle;
-                if(child.getType().isArray()  ||
-                        child.getType().getFields().size() > 0 ) {
-                    child.closeDeepStructure();
+                if (child.getType().isArray() ||
+                                  child.getType().getFields().size() > 0) {
+                    child.closeArraySizes();
                 }
             }
         }

Modified: trunk/src/org/griphyn/vdl/mapping/RootDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/RootDataNode.java	2010-07-22 22:09:52 UTC (rev 3465)
+++ trunk/src/org/griphyn/vdl/mapping/RootDataNode.java	2010-07-24 04:16:02 UTC (rev 3466)
@@ -113,6 +113,8 @@
 			checkConsistency(root);
 		}
 		else if (mapper.isStatic()) {
+			// Static mappers are (array) mappers which know the size of
+			// an array statically. A good example is the fixed array mapper
 			Iterator i = mapper.existing().iterator();
 			while (i.hasNext()) {
 				Path p = (Path) i.next();
@@ -129,7 +131,7 @@
 				}
 			}
 			if (root.isArray()) {
-				root.closeDeepStructure();
+			    root.closeArraySizes();
 			}
 			checkConsistency(root);
 		}