X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FDasSequenceSource.java;h=dd3d901ecc8b3405787ec87fc78bb6af68981219;hb=d62b90cb6effb7b380e5f7d590691dd884b024cf;hp=17327344cf7815f52bd8d4f9c5ee33fa64daeb25;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java index 1732734..dd3d901 100644 --- a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java +++ b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * 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. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws.dbsources.das.datamodel; @@ -37,6 +39,7 @@ 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; @@ -71,9 +74,10 @@ public class DasSequenceSource extends DbSourceProxyImpl implements protected MultipleConnectionPropertyProviderI connprops = null; /** - * DAS sources are tier 1 - if we have a direct DB connection then we should prefer it + * DAS sources are tier 1 - if we have a direct DB connection then we should + * prefer it */ - private int tier=1; + private int tier = 1; /** * create a new DbSource proxy for a DAS 1 source @@ -97,10 +101,9 @@ public class DasSequenceSource extends DbSourceProxyImpl implements if (!(jsrc = new JalviewSource(source, connprops, false)) .isSequenceSource()) { - throw new Exception("Source " + source.getTitle() - + " does not support the sequence command."); + 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.tier = 1 + ((jsrc.isLocal() || jsrc.isReferenceSource()) ? 0 : 1); this.source = source; this.dbname = dbname; this.dbrefname = dbrefname.toUpperCase();