Merge branch 'develop' into spike/JAL-1950_hmmer3client

[jalview.git] / test / jalview / ws / SequenceFetcherTest.java

diff --git a/test/jalview/ws/SequenceFetcherTest.java b/test/jalview/ws/SequenceFetcherTest.java
index 7a9b553..a54ce8b 100644 (file)
--- a/test/jalview/ws/SequenceFetcherTest.java
+++ b/test/jalview/ws/SequenceFetcherTest.java
@@ -25,7 +25,7 @@ public class SequenceFetcherTest
     // assertions
 
     AlignmentI ds = null;
-    Vector noProds = new Vector();
+    Vector<Object[]> noProds = new Vector<Object[]>();
     String usage = "SequenceFetcher.main [-nodas] [<DBNAME> [<ACCNO>]]\n"
             + "With no arguments, all DbSources will be queried with their test Accession number.\n"
             + "With one argument, the argument will be resolved to one or more db sources and each will be queried with their test accession only.\n"
@@ -116,7 +116,8 @@ public class SequenceFetcherTest
                 System.out.println("Type: " + types[t]);
                 SequenceI[] prod = jalview.analysis.CrossRef
                         .findXrefSequences(al.getSequencesArray(), dna,
-                                types[t]).getSequencesArray();
+                                types[t], null)
+                        .getSequencesArray();
                 System.out.println("Found "
                         + ((prod == null) ? "no" : "" + prod.length)
                         + " products");
@@ -184,11 +185,11 @@ public class SequenceFetcherTest
       }
       if (noProds.size() > 0)
       {
-        Enumeration ts = noProds.elements();
+        Enumeration<Object[]> ts = noProds.elements();
         while (ts.hasMoreElements())
   
         {
-          Object[] typeSq = (Object[]) ts.nextElement();
+          Object[] typeSq = ts.nextElement();
           boolean dna = (typeSq.length > 1);
           AlignmentI al = (AlignmentI) typeSq[0];
           System.out.println("Trying getProducts for "