X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEmblXmlSource.java;h=ec5c62dc1ba3d0c655f86096ba278a332dca1253;hb=692665370a03079eee96e3e47482df5e792ee5d0;hp=47179e23daf979c5491cbda3314752d1044c66b3;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git diff --git a/src/jalview/ws/dbsources/EmblXmlSource.java b/src/jalview/ws/dbsources/EmblXmlSource.java index 47179e2..ec5c62d 100644 --- a/src/jalview/ws/dbsources/EmblXmlSource.java +++ b/src/jalview/ws/dbsources/EmblXmlSource.java @@ -1,19 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 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; @@ -21,11 +24,11 @@ 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; import java.util.Iterator; -import java.util.Vector; public abstract class EmblXmlSource extends EbiFileRetrievedProxy { @@ -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();