DBRefs now array

[jalview.git] / src / jalview / util / DBRefUtils.java

diff --git a/src/jalview/util/DBRefUtils.java b/src/jalview/util/DBRefUtils.java
index 2f844da..d3788ea 100755 (executable)
--- a/src/jalview/util/DBRefUtils.java
+++ b/src/jalview/util/DBRefUtils.java
@@ -4,6 +4,7 @@ import java.util.*;
 
 import jalview.datamodel.*;
 
+
 public class DBRefUtils
 {
     /**
@@ -15,23 +16,29 @@ public class DBRefUtils
      * @param sources String[] array of source DBRef IDs to retrieve
      * @return Vector
      */
-    public static Vector selectRefs(java.util.Vector dbrefs, String[] sources) {
+    public static DBRefEntry [] selectRefs(DBRefEntry [] dbrefs, String[] sources) {
       if (dbrefs==null)
         return null;
       if (sources==null)
         return dbrefs;
       Hashtable srcs = new Hashtable();
       Vector res=new Vector();
+
       for (int i=0; i<sources.length; i++)
         srcs.put(new String(sources[i]), new Integer(i));
-      for (int i=0, j=dbrefs.size(); i<j; i++)
-        if (dbrefs.get(i) instanceof jalview.datamodel.DBRefEntry) {
-          jalview.datamodel.DBRefEntry entry = (jalview.datamodel.DBRefEntry) dbrefs.get(i);
-          if (srcs.containsKey(entry.getSource()))
-            res.add(entry);
+      for (int i = 0, j = dbrefs.length; i < j; i++)
+        {
+          if (srcs.containsKey(dbrefs[i].getSource()))
+            res.add(dbrefs[i]);
         }
+
       if (res.size()>0)
-        return res;
+      {
+        DBRefEntry [] reply = new DBRefEntry[res.size()];
+        for(int i=0; i<res.size(); i++)
+          reply[i] = (DBRefEntry)res.elementAt(i);
+        return reply;
+      }
       res = null;
       // there are probable  memory leaks in the hashtable!
       return null;