[MOBY-guts] biomoby commit

[Martin Senger]

senger
Sat Nov 11 18:04:34 EST 2006
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared
In directory dev.open-bio.org:/tmp/cvs-serv15098/src/main/org/biomoby/shared

Modified Files:
	MobyPrimaryDataSet.java MobyPrimaryDataSimple.java 
	MobySecondaryData.java MobyService.java Utils.java 
Log Message:
removing java warnings + update of Perl-Moses
moby-live/Java/src/main/org/biomoby/shared MobyPrimaryDataSet.java,1.8,1.9 MobyPrimaryDataSimple.java,1.9,1.10 MobySecondaryData.java,1.8,1.9 MobyService.java,1.14,1.15 Utils.java,1.16,1.17
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyPrimaryDataSet.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/MobyPrimaryDataSet.java	2006/10/30 15:55:36	1.8
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyPrimaryDataSet.java	2006/11/11 23:04:34	1.9
@@ -24,7 +24,8 @@
 public class MobyPrimaryDataSet
     extends MobyPrimaryData {
 
-    protected Vector elements = new Vector(); // elemenst are of type MobyPrimaryDataSimple
+    protected Vector<MobyPrimaryDataSimple> elements =
+	new Vector<MobyPrimaryDataSimple>();
     protected MobyDataType defaultDataType = new MobyDataType("Object");
 
     /**************************************************************************

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyPrimaryDataSimple.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/MobyPrimaryDataSimple.java	2006/07/07 04:12:40	1.9
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyPrimaryDataSimple.java	2006/11/11 23:04:34	1.10
@@ -28,7 +28,7 @@
 public class MobyPrimaryDataSimple
     extends MobyPrimaryData {
 
-    protected Vector namespaces = new Vector();   // elements are of type MobyNamespace
+    protected Vector<MobyNamespace> namespaces = new Vector<MobyNamespace>();
     protected MobyDataType dataType;
 
     /**************************************************************************

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobySecondaryData.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/MobySecondaryData.java	2006/07/07 04:12:40	1.8
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobySecondaryData.java	2006/11/11 23:04:34	1.9
@@ -28,7 +28,7 @@
     protected String defaultValue = "";
     protected String minimumValue = "";
     protected String maximumValue = "";
-    protected Vector allowedValues = new Vector();
+    protected Vector<String> allowedValues = new Vector<String>();
     protected String description = "";
 
     /**************************************************************************

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyService.java	2006/10/26 00:33:35	1.14
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyService.java	2006/11/11 23:04:34	1.15
@@ -67,9 +67,9 @@
     protected static MobyService[] services = uninitializedServices;
 
     // the elements of these Vectors are of type MobyData
-    protected Vector primaryInputs = new Vector();
-    protected Vector secondaryInputs = new Vector();
-    protected Vector primaryOutputs = new Vector();
+    protected Vector<MobyData> primaryInputs = new Vector<MobyData>();
+    protected Vector<MobyData> secondaryInputs = new Vector<MobyData>();
+    protected Vector<MobyData> primaryOutputs = new Vector<MobyData>();
 
     /**************************************************************************
      * Implementing Comparable interface.

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/Utils.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/Utils.java	2006/09/27 11:15:59	1.16
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/Utils.java	2006/11/11 23:04:34	1.17
@@ -468,7 +468,7 @@
     /*************************************************************************
      *
      *************************************************************************/
-    protected static HashSet javaReserved = new HashSet();
+    protected static HashSet<String> javaReserved = new HashSet<String>();
     static {
         javaReserved.add ("abstract");
         javaReserved.add ("assert");