[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Oct 31 11:35:55 EDT 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data
In directory dev.open-bio.org:/tmp/cvs-serv29055/src/main/org/biomoby/shared/data

Modified Files:
	MobyDataComposite.java MobyDataObject.java 
Log Message:
Fixed registry propagation
moby-live/Java/src/main/org/biomoby/shared/data MobyDataComposite.java,1.18,1.19 MobyDataObject.java,1.19,1.20
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java	2007/08/10 20:23:01	1.18
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java	2007/10/31 15:35:55	1.19
@@ -93,7 +93,7 @@
     }
 
     public MobyDataComposite(MobyDataType type, String name, String namespace, String id){
-	super(namespace, id);
+	super(namespace, id, type.getRegistry());
 	setName(name);
 	setDataType(type);
 	members = new ConcurrentHashMap<String, MobyDataObject>();
@@ -108,7 +108,7 @@
     }
 
     public MobyDataComposite(String typeName, String name, String namespace, String id, Registry registry){
-	super(namespace, id);
+	super(namespace, id, registry);
 	setName(name);
 	setDataType(MobyDataType.getDataType(typeName, registry));
 	members = new ConcurrentHashMap<String, MobyDataObject>();

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java	2007/07/27 21:44:21	1.19
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java	2007/10/31 15:35:55	1.20
@@ -82,7 +82,7 @@
 	setDataType(MobyDataType.getDataType(MobyTags.MOBYOBJECT, registry));
 	setId(id);	
 
-	MobyNamespace nsObj = MobyNamespace.getNamespace(namespace);
+	MobyNamespace nsObj = MobyNamespace.getNamespace(namespace, registry);
 	if(nsObj == null){
 	    // Not in the ontology, so create a token namespace
 	    nsObj = new MobyNamespace(namespace == null ? "" : namespace);