X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2FSequenceFetcher.java;h=a0b77deff937aa8ef2ef395515a87e2a210904b4;hb=141abbd1a196f26a643318ed9677d0225c568402;hp=1f8c28ab32f0c27fc9d403b9186a59b45f2dbc68;hpb=908bf85e4afe1e303515797719df5dd8afec06e7;p=jalview.git diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java index 1f8c28a..a0b77de 100644 --- a/src/jalview/ws/SequenceFetcher.java +++ b/src/jalview/ws/SequenceFetcher.java @@ -27,10 +27,8 @@ import jalview.ws.dbsources.EmblSource; import jalview.ws.dbsources.Pdb; import jalview.ws.dbsources.PfamFull; import jalview.ws.dbsources.PfamSeed; -import jalview.ws.dbsources.RfamFull; import jalview.ws.dbsources.RfamSeed; import jalview.ws.dbsources.Uniprot; -import jalview.ws.dbsources.UniprotName; import jalview.ws.dbsources.das.api.jalviewSourceI; import jalview.ws.seqfetcher.ASequenceFetcher; import jalview.ws.seqfetcher.DbSourceProxy; @@ -62,13 +60,11 @@ public class SequenceFetcher extends ASequenceFetcher addDBRefSourceImpl(EmblSource.class); addDBRefSourceImpl(EmblCdsSource.class); addDBRefSourceImpl(Uniprot.class); - addDBRefSourceImpl(UniprotName.class); addDBRefSourceImpl(Pdb.class); addDBRefSourceImpl(PfamFull.class); addDBRefSourceImpl(PfamSeed.class); - // ensures Seed alignment is 'default' for PFAM - addDBRefSourceImpl(RfamFull.class); addDBRefSourceImpl(RfamSeed.class); + if (addDas) { registerDasSequenceSources(); @@ -82,7 +78,8 @@ public class SequenceFetcher extends ASequenceFetcher public String[] getOrderedSupportedSources() { String[] srcs = this.getSupportedDb(); - ArrayList dassrc = new ArrayList(), nondas = new ArrayList(); + ArrayList dassrc = new ArrayList(), + nondas = new ArrayList(); for (int i = 0; i < srcs.length; i++) { boolean das = false, skip = false; @@ -98,7 +95,8 @@ public class SequenceFetcher extends ASequenceFetcher else { nm = dbs.getDbName(); - if (getSourceProxy(srcs[i]) instanceof jalview.ws.dbsources.das.datamodel.DasSequenceSource) + if (getSourceProxy( + srcs[i]) instanceof jalview.ws.dbsources.das.datamodel.DasSequenceSource) { if (nm.startsWith("das:")) { @@ -122,8 +120,8 @@ public class SequenceFetcher extends ASequenceFetcher nondas.add(srcs[i]); } } - String[] tosort = nondas.toArray(new String[0]), sorted = nondas - .toArray(new String[0]); + String[] tosort = nondas.toArray(new String[0]), + sorted = nondas.toArray(new String[0]); for (int j = 0, jSize = sorted.length; j < jSize; j++) { tosort[j] = tosort[j].toLowerCase();