[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Tue Jan 23 14:36:25 EST 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data
In directory dev.open-bio.org:/tmp/cvs-serv25769/src/main/org/biomoby/shared/data

Modified Files:
	MobyDataComposite.java 
Log Message:
Made DOM-built composites handle HAS children nicely
moby-live/Java/src/main/org/biomoby/shared/data MobyDataComposite.java,1.10,1.11
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java	2006/12/13 23:15:58	1.10
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java	2007/01/23 19:36:25	1.11
@@ -35,8 +35,6 @@
 	this(MobyDataType.getDataType(element.getLocalName()), getName(element), getNamespace(element), getId(element));
 
 	// Decompose the children
-	ConcurrentHashMap<String, MobyDataObject> children = new ConcurrentHashMap<String, MobyDataObject>();
-	//HashMap children = new HashMap();
 	org.w3c.dom.NodeList substructures = MobyPrefixResolver.getChildElements(element, "*"); //wildcard
 	int numSubstructures = substructures.getLength();
 	for(int i = 0; i < numSubstructures; i++){
@@ -56,13 +54,10 @@
 						       " does not have an article " +
 						       "name, which is required");
 		}
-		
-		// TODO, must deal with 1-to-many HAS relationship
-		children.put(fieldName, (MobyDataObject) createInstanceFromDOM(child));
+
+		put(fieldName, (MobyDataObject) createInstanceFromDOM(child));
 	    }
 	}
-
-	putAll(children);
     }
 
     public MobyDataComposite(MobyDataType type, String name, MobyNamespace namespace, String id){