X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fseqfetcher%2FASequenceFetcher.java;h=c28d8e2c75bf7ab077e4426693708182571fa38f;hp=a8a390465c4b6466ca20ac1052f44ba890541f40;hb=8edebdd9789b2d93fb8f9db24b8be2c1e6317690;hpb=eee8dfa05eeea5b7cc295ba020647842502efe63 diff --git a/src/jalview/ws/seqfetcher/ASequenceFetcher.java b/src/jalview/ws/seqfetcher/ASequenceFetcher.java index a8a3904..c28d8e2 100644 --- a/src/jalview/ws/seqfetcher/ASequenceFetcher.java +++ b/src/jalview/ws/seqfetcher/ASequenceFetcher.java @@ -20,6 +20,14 @@ */ package jalview.ws.seqfetcher; +import jalview.bin.Cache; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.SequenceI; +import jalview.util.DBRefUtils; +import jalview.util.MessageManager; +import jalview.util.QuickSort; + import java.util.ArrayList; import java.util.Enumeration; import java.util.HashSet; @@ -30,12 +38,6 @@ import java.util.Map; import java.util.Stack; import java.util.Vector; -import jalview.datamodel.AlignmentI; -import jalview.datamodel.DBRefEntry; -import jalview.datamodel.SequenceI; -import jalview.util.DBRefUtils; -import jalview.util.MessageManager; - public class ASequenceFetcher { @@ -83,12 +85,12 @@ public class ASequenceFetcher return true; } } - jalview.bin.Cache.log.warn("isFetchable doesn't know about '" + source + Cache.log.warn("isFetchable doesn't know about '" + source + "'"); return false; } - public SequenceI[] getSequences(jalview.datamodel.DBRefEntry[] refs) + public SequenceI[] getSequences(DBRefEntry[] refs) { SequenceI[] ret = null; Vector rseqs = new Vector(); @@ -288,7 +290,7 @@ public class ASequenceFetcher { nm[i++] = "" + s.getTier() + s.getDbName().toLowerCase(); } - jalview.util.QuickSort.sort(nm, l); + QuickSort.sort(nm, l); dbs = new ArrayList(); for (i = l.length - 1; i >= 0; i--) { @@ -391,7 +393,7 @@ public class ASequenceFetcher */ public String[] getDbInstances(Class class1) { - if (!jalview.ws.seqfetcher.DbSourceProxy.class.isAssignableFrom(class1)) + if (!DbSourceProxy.class.isAssignableFrom(class1)) { throw new Error(MessageManager.formatMessage("error.implementation_error_dbinstance_must_implement_interface", new String[]{class1.toString()})); }