Merge branch 'JAL-972-dasobert-to-jdas' into JAL-972-jdas

[jalview.git] / src / jalview / ws / DBRefFetcher.java

diff --git a/src/jalview/ws/DBRefFetcher.java b/src/jalview/ws/DBRefFetcher.java
index a9c4203..9565679 100644 (file)
--- a/src/jalview/ws/DBRefFetcher.java
+++ b/src/jalview/ws/DBRefFetcher.java
@@ -30,6 +30,7 @@ import jalview.gui.CutAndPasteTransfer;
 import jalview.gui.Desktop;\r
 import jalview.gui.IProgressIndicator;\r
 import jalview.gui.OOMWarning;\r
+import jalview.ws.dbsources.das.api.jalviewSourceI;\r
 \r
 import java.lang.reflect.Array;\r
 import java.util.Enumeration;\r
@@ -37,8 +38,6 @@ import java.util.Hashtable;
 import java.util.StringTokenizer;\r
 import java.util.Vector;\r
 \r
-import org.biojava.dasobert.dasregistry.DasSource;\r
-\r
 import uk.ac.ebi.picr.model.UPEntry;\r
 \r
 /**\r
@@ -124,15 +123,15 @@ public class DBRefFetcher implements Runnable
     {\r
       // af.featureSettings_actionPerformed(null);\r
       String[] defdb = null, otherdb = sfetcher\r
-              .getDbInstances(jalview.ws.dbsources.DasSequenceSource.class);\r
+              .getDbInstances(jalview.ws.dbsources.das.datamodel.DasSequenceSource.class);\r
       Vector selsources = new Vector(), dasselsrc = (af.featureSettings != null) ? af.featureSettings\r
               .getSelectedSources() : new jalview.gui.DasSourceBrowser()\r
               .getSelectedSources();\r
       Enumeration en = dasselsrc.elements();\r
       while (en.hasMoreElements())\r
       {\r
-        DasSource src = (DasSource) en.nextElement();\r
-        selsources.addElement(src.getNickname());\r
+        jalviewSourceI src = (jalviewSourceI) en.nextElement();\r
+        selsources.addElement(src.getTitle());\r
       }\r
       int osel = 0;\r
       for (int o = 0; otherdb != null && o < otherdb.length; o++)\r
@@ -188,7 +187,7 @@ public class DBRefFetcher implements Runnable
     }\r
     // append additional sources\r
     String[] otherdb = sfetcher\r
-            .getDbInstances(jalview.ws.dbsources.DasSequenceSource.class);\r
+            .getDbInstances(jalview.ws.dbsources.das.datamodel.DasSequenceSource.class);\r
     if (otherdb != null && otherdb.length > 0)\r
     {\r
       String[] newsrc = new String[dbSources.length + otherdb.length];\r