[MOBY-guts] biomoby commit

Paul Gordon gordonp at dev.open-bio.org
Thu Dec 6 23:43:17 UTC 2007


gordonp
Thu Dec  6 18:43:17 EST 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data
In directory dev.open-bio.org:/tmp/cvs-serv31242/src/main/org/biomoby/shared/data

Modified Files:
	MobyDataBoolean.java MobyDataDateTime.java MobyDataFloat.java 
	MobyDataInt.java MobyDataObject.java MobyDataObjectSAI.java 
	MobyDataString.java 
Log Message:
Added registry support in cloning
moby-live/Java/src/main/org/biomoby/shared/data MobyDataBoolean.java,1.6,1.7 MobyDataDateTime.java,1.11,1.12 MobyDataFloat.java,1.9,1.10 MobyDataInt.java,1.8,1.9 MobyDataObject.java,1.23,1.24 MobyDataObjectSAI.java,1.1,1.2 MobyDataString.java,1.8,1.9
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBoolean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBoolean.java	2007/11/30 17:23:16	1.6
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBoolean.java	2007/12/06 23:43:17	1.7
@@ -98,7 +98,7 @@
     }
 
     public Object clone(){
-	MobyDataBoolean copy = new MobyDataBoolean(getName(), value);
+	MobyDataBoolean copy = new MobyDataBoolean(getName(), value, getDataType().getRegistry());
 	copy.setDataType(getDataType());
 	copy.setId(getId());
 	copy.setNamespaces(getNamespaces());

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java	2007/11/30 17:23:16	1.11
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java	2007/12/06 23:43:17	1.12
@@ -317,7 +317,7 @@
 
 
     public Object clone(){
-	MobyDataDateTime copy = new MobyDataDateTime(getName(), getValue());
+	MobyDataDateTime copy = new MobyDataDateTime(getName(), getValue(), getDataType().getRegistry());
 	copy.setDataType(getDataType());
 	copy.setId(getId());
 	copy.setNamespaces(getNamespaces());

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java	2007/11/30 17:23:16	1.9
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java	2007/12/06 23:43:17	1.10
@@ -114,7 +114,7 @@
     }
 
     public Object clone(){
-	MobyDataFloat copy = new MobyDataFloat(getName(), value);
+	MobyDataFloat copy = new MobyDataFloat(getName(), value, getDataType().getRegistry());
 	copy.setDataType(getDataType());
 	copy.setId(getId());
 	copy.setNamespaces(getNamespaces());

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java	2007/11/30 17:23:16	1.8
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java	2007/12/06 23:43:17	1.9
@@ -209,7 +209,7 @@
     }   
 
     public Object clone(){
-	MobyDataInt copy = new MobyDataInt(getName(), value);
+	MobyDataInt copy = new MobyDataInt(getName(), value, getDataType().getRegistry());
 	copy.setDataType(getDataType());
 	copy.setId(getId());
 	copy.setNamespaces(getNamespaces());

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java	2007/12/06 16:58:33	1.23
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java	2007/12/06 23:43:17	1.24
@@ -538,7 +538,7 @@
      */
     public Object clone(){
 	MobyDataObject copy = null;
-	copy = new MobyDataObject(getName());
+	copy = new MobyDataObject(getName(), getDataType().getRegistry());
 	copy.setNamespaces(getNamespaces());
 	copy.setId(getId());
 	return copy;

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSAI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSAI.java	2006/07/07 04:12:40	1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSAI.java	2007/12/06 23:43:17	1.2
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 
+import org.biomoby.registry.meta.Registry;
 import org.biomoby.shared.*;
 
 /**
@@ -23,9 +24,13 @@
      * Constructor for base Objects.
      */
     public MobyDataObjectSAI(String namespace, String id, MobyService[] services){
-	super("");  // Not using c-tor(namespace, id), then assigning "this" to
-	            // dataInstance, because that would cause recursion in the shadowed calls
-	dataInstance = new MobyDataObject(namespace, id);
+	this(namespace, id, services, null);
+    }
+
+    public MobyDataObjectSAI(String namespace, String id, MobyService[] services, Registry registry){
+	super("", registry);  // Not using c-tor(namespace, id), then assigning "this" to
+	                      // dataInstance, because that would cause recursion in the shadowed calls
+	dataInstance = new MobyDataObject(namespace, id, registry);
 	mobyServices = services;
     }
 
@@ -33,7 +38,7 @@
      * Constructor that takes an existing object and associates services with it.
      */
     public MobyDataObjectSAI(MobyDataObject mdsi, MobyService[] services){
-	super(mdsi.getName());
+	super(mdsi.getName(), mdsi.getDataType().getRegistry());
 	dataInstance = mdsi;
 	mobyServices = services;
     }

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java	2007/11/30 17:23:16	1.8
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java	2007/12/06 23:43:17	1.9
@@ -59,7 +59,7 @@
     }
 
     public Object clone(){
-	MobyDataString copy = new MobyDataString(getName(), value);
+	MobyDataString copy = new MobyDataString(getName(), value, getDataType().getRegistry());
 	copy.setDataType(getDataType());
 	copy.setId(getId());
 	copy.setNamespaces(getNamespaces());




More information about the MOBY-guts mailing list