[MOBY-guts] biomoby commit

[Paul Gordon]

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

Modified Files:
	MobyDataJob.java 
Log Message:
Added many typechecks
moby-live/Java/src/main/org/biomoby/shared/data MobyDataJob.java,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataJob.java	2007/02/08 16:59:58	1.3
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataJob.java	2007/12/06 17:44:35	1.4
@@ -25,35 +25,35 @@
     }
 
     public MobyDataSecondaryInstance[] getSecondaryData(){
-	Vector contents = new Vector();
+	Vector<MobyDataSecondaryInstance> contents = new Vector<MobyDataSecondaryInstance>();
 	
 	Iterator values = keySet().iterator();
 	while(values.hasNext()){
 	    String dataName = (String) values.next();
 	    Object data = get(dataName);
 	    if(data instanceof MobyDataSecondaryInstance){
-		contents.add(data);
+		contents.add((MobyDataSecondaryInstance) data);
 	    }
 	}
 	return (MobyDataSecondaryInstance[]) contents.toArray(new MobyDataSecondaryInstance[contents.size()]);
     }
 
     public MobyDataInstance[] getData(){
-	Vector contents = new Vector();
+	Vector<MobyDataInstance> contents = new Vector<MobyDataInstance>();
 	
 	Iterator values = keySet().iterator();
 	while(values.hasNext()){
 	    String dataName = (String) values.next();
 	    Object data = get(dataName);
 	    if(data instanceof MobyDataInstance){
-		contents.add(data);
+		contents.add((MobyDataInstance) data);
 	    }
 	}
 	return (MobyDataInstance[]) contents.toArray(new MobyDataInstance[contents.size()]);
     }
 
     public MobyDataInstance[] getPrimaryData(){
-	Vector contents = new Vector();
+	Vector<MobyDataInstance> contents = new Vector<MobyDataInstance>();
 	
 	Iterator values = keySet().iterator();
 	while(values.hasNext()){
@@ -61,35 +61,35 @@
 	    Object data = get(dataName);
 	    if(data instanceof MobyDataObject ||
 	       data instanceof MobyDataObjectSet){
-		contents.add(data);
+		contents.add((MobyDataInstance) data);
 	    }
 	}
 	return (MobyDataInstance[]) contents.toArray(new MobyDataInstance[contents.size()]);
     }
 
     public MobyDataObject[] getPrimaryDataObjects(){
-	Vector contents = new Vector();
+	Vector<MobyDataObject> contents = new Vector<MobyDataObject>();
 	
 	Iterator values = keySet().iterator();
 	while(values.hasNext()){
 	    String dataName = (String) values.next();
 	    Object data = get(dataName);
 	    if(data instanceof MobyDataObject){
-		contents.add(data);
+		contents.add((MobyDataObject) data);
 	    }
 	}
 	return (MobyDataObject[]) contents.toArray(new MobyDataObject[contents.size()]);
     }
 
     public MobyDataObjectSet[] getPrimaryDataObjectSets(){
-	Vector contents = new Vector();
+	Vector<MobyDataObjectSet> contents = new Vector<MobyDataObjectSet>();
 	
 	Iterator values = keySet().iterator();
 	while(values.hasNext()){
 	    String dataName = (String) values.next();
 	    Object data = get(dataName);
 	    if(data instanceof MobyDataObjectSet){
-		contents.add(data);
+		contents.add((MobyDataObjectSet) data);
 	    }
 	}
 	return (MobyDataObjectSet[]) contents.toArray(new MobyDataObjectSet[contents.size()]);