X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEmblXmlSource.java;h=58ee42dc83f82dfadcb430a6c98ef337be53d9e7;hb=330289271fe2239a59fa318d6b2b19fdd319f8a4;hp=fe67b21283031201f83c1212c255489c85534ed1;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/jalview/ws/dbsources/EmblXmlSource.java b/src/jalview/ws/dbsources/EmblXmlSource.java index fe67b21..58ee42d 100644 --- a/src/jalview/ws/dbsources/EmblXmlSource.java +++ b/src/jalview/ws/dbsources/EmblXmlSource.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * 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; @@ -22,6 +24,7 @@ import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; import jalview.datamodel.xdb.embl.EmblEntry; +import jalview.util.MessageManager; import jalview.ws.ebi.EBIFetchClient; import java.io.File; @@ -63,8 +66,7 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy } catch (Exception e) { stopQuery(); - throw new Exception("EBI EMBL XML retrieval failed on " - + emprefx.toLowerCase() + ":" + query.trim(), e); + throw new Exception(MessageManager.formatMessage("exception.ebiembl_retrieval_failed_on", new String[]{emprefx.toLowerCase(),query.trim()}), e); } return getEmblSequenceRecords(emprefx, query, reply); } @@ -96,8 +98,7 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy } else { - result.append("# No EMBL record retrieved for " - + emprefx.toLowerCase() + ":" + query.trim()); + result.append(MessageManager.formatMessage("label.no_embl_record_found", new String[]{emprefx.toLowerCase(),query.trim()})); } } if (efile != null) @@ -151,8 +152,7 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy if (seqs != null && seqs.length > 0) { al = new Alignment(seqs); - result.append("# Successfully parsed the " + emprefx - + " queries into an Alignment"); + result.append(MessageManager.formatMessage("label.embl_successfully_parsed", new String[]{emprefx})); results = result; } stopQuery();