From 90560ab275c0cc276bbb3b77c94173adfee03f18 Mon Sep 17 00:00:00 2001
From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Wed, 29 Feb 2012 16:18:47 +0000
Subject: [PATCH] refactoring dassequencesource code fallout

---
 src/jalview/ws/DBRefFetcher.java |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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