[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Thu Dec  6 12:39:02 EST 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data
In directory dev.open-bio.org:/tmp/cvs-serv25643/src/main/org/biomoby/shared/data

Modified Files:
	MobyDataComposite.java 
Log Message:
Added typechecks
moby-live/Java/src/main/org/biomoby/shared/data MobyDataComposite.java,1.21,1.22
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java	2007/12/01 01:26:09	1.21
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java	2007/12/06 17:39:02	1.22
@@ -340,8 +340,7 @@
     /**
      * Retrieves each field name/MobyDataObject pair for the members of the composite object
      */
-    //    public Set<Map.Entry<String,MobyDataObject>> entrySet(){
-    public Set entrySet(){
+    public Set<Map.Entry<String,MobyDataObject>> entrySet(){
 	return members.entrySet();
     }
 
@@ -488,7 +487,7 @@
     /**
      * Sets a number of object fields at once.
      */
-    public void putAll(Map map){
+    public void putAll(Map<? extends String,? extends MobyDataObject> map){
 	members.putAll(map);
     }
 
@@ -513,7 +512,7 @@
      * For the user's convenience, the returned Collection is a MobyDataSetInstance, allowing
      * for MOBY-savvy equivalency testing with another Collection of data instances.
      */
-    public Collection values(){
+    public Collection<MobyDataObject> values(){
 	return new MobyDataObjectSet("", members.values());
     }