X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FDasSequenceSource.java;h=32e4f3e0f7e31c3ae2e0709de0fb87278cd4f255;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=3ad35733f71ae781499e286324c089fd75cd95ee;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java index 3ad3573..32e4f3e 100644 --- a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java +++ b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,6 +20,17 @@ */ package jalview.ws.dbsources.das.datamodel; +import jalview.bin.Cache; +import jalview.datamodel.Alignment; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceI; +import jalview.util.MessageManager; +import jalview.ws.dbsources.das.api.jalviewSourceI; +import jalview.ws.seqfetcher.DbSourceProxy; +import jalview.ws.seqfetcher.DbSourceProxyImpl; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -39,16 +50,6 @@ import org.biodas.jdas.schema.sources.VERSION; import com.stevesoft.pat.Regex; -import jalview.util.MessageManager; -import jalview.ws.dbsources.das.api.jalviewSourceI; -import jalview.ws.seqfetcher.*; -import jalview.bin.Cache; -import jalview.datamodel.Alignment; -import jalview.datamodel.AlignmentI; -import jalview.datamodel.DBRefEntry; -import jalview.datamodel.Sequence; -import jalview.datamodel.SequenceI; - /** * an instance of this class is created for each unique DAS Sequence source (ie * one capable of handling the 'sequence' for a particular MapMaster) @@ -101,7 +102,9 @@ public class DasSequenceSource extends DbSourceProxyImpl implements if (!(jsrc = new JalviewSource(source, connprops, false)) .isSequenceSource()) { - throw new Exception(MessageManager.formatMessage("exception.das_source_doesnt_support_sequence_command", new String[]{source.getTitle()})); + throw new Exception(MessageManager.formatMessage( + "exception.das_source_doesnt_support_sequence_command", + new String[] { source.getTitle() })); } this.tier = 1 + ((jsrc.isLocal() || jsrc.isReferenceSource()) ? 0 : 1); this.source = source; @@ -172,8 +175,7 @@ public class DasSequenceSource extends DbSourceProxyImpl implements connprops.getConnectionPropertyProviderFor(sr)); for (String q : toks) { - List qset = Arrays.asList(new String[] - { q }); + List qset = Arrays.asList(new String[] { q }); try { DasSequenceAdapter s = sq.fetchData(sr, qset);