[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/parser
In directory dev.open-bio.org:/tmp/cvs-serv15098/src/main/org/biomoby/shared/parser

Modified Files:
	ServiceException.java 
Log Message:
removing java warnings + update of Perl-Moses
moby-live/Java/src/main/org/biomoby/shared/parser ServiceException.java,1.10,1.11
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/parser/ServiceException.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/parser/ServiceException.java	2006/10/25 02:33:23	1.10
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/parser/ServiceException.java	2006/11/11 23:04:34	1.11
@@ -128,14 +128,14 @@
     protected int code = OK;
     protected String description;
 
-    static HashMap severityNames = new HashMap();
+    static HashMap<Integer,String> severityNames = new HashMap<Integer,String>();
     static {
 	severityNames.put (new Integer (ERROR),   "error");
 	severityNames.put (new Integer (WARNING), "warning");
 	severityNames.put (new Integer (INFO),    "information");
     }
 
-    static HashMap codeNames = new HashMap();
+    static HashMap<Integer,String> codeNames = new HashMap<Integer,String>();
     static {
 	codeNames.put (new Integer (OK), "OK");
 	codeNames.put (new Integer (UNKNOWN_NAME), "UNKNOWN_NAME");
@@ -436,22 +436,23 @@
      * @return an array, potentially an empty array, of all exceptions
      * extracted from the 'serviceNotes'
      *************************************************************************/
+    @SuppressWarnings("unchecked")
     public static ServiceException[] extractExceptions (Element serviceNotes) {
 	if (serviceNotes == null)
 	    return new ServiceException[] {};
 
-	Vector v = new Vector();
-	for (Iterator it =
+	Vector<ServiceException> v = new Vector<ServiceException>();
+	for (Iterator<Element> it =
 		 serviceNotes.getChildren (MobyTags.MOBYEXCEPTION).iterator();
 	     it.hasNext(); ) {
-	    ServiceException ex = extractException ((Element)it.next());
+	    ServiceException ex = extractException (it.next());
 	    if (ex != null)
 		v.addElement (ex);
 	}
-	for (Iterator it =
+	for (Iterator<Element> it =
 		 serviceNotes.getChildren (MobyTags.MOBYEXCEPTION, JDOMUtils.MOBY_NS).iterator();
 	     it.hasNext(); ) {
-	    ServiceException ex = extractException ((Element)it.next());
+	    ServiceException ex = extractException (it.next());
 	    if (ex != null)
 		v.addElement (ex);
 	}