X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FAnnotate3D.java;h=509d4ae91f1487d941fa56fa5100c7abd5803ed9;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=e90b2d25b7563a3388667147bb02cc9a1d5d2eaa;hpb=9d75efeeb9a6e51bd328f56e376dca4e007b635c;p=jalview.git diff --git a/src/jalview/ws/jws1/Annotate3D.java b/src/jalview/ws/jws1/Annotate3D.java index e90b2d2..509d4ae 100644 --- a/src/jalview/ws/jws1/Annotate3D.java +++ b/src/jalview/ws/jws1/Annotate3D.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.2b1) + * 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.jws1; @@ -22,6 +25,7 @@ import jalview.datamodel.AlignmentI; import jalview.io.FileParse; import jalview.io.FormatAdapter; import jalview.io.InputStreamParser; +import jalview.util.MessageManager; import java.io.BufferedReader; import java.io.FileReader; @@ -79,15 +83,17 @@ public class Annotate3D } Iterator r = jalview.ext.paradise.Annotate3D .getRNAMLForPDBFileAsString(sb.toString()); - AlignmentI al=null; + AlignmentI al = null; while (r.hasNext()) { FileParse fp = new InputStreamParser(r.next(), source.getDataName()); AlignmentI nal = new FormatAdapter().readFromFile(fp, "RNAML"); - if (al==null) + if (al == null) { al = nal; - } else { + } + else + { al.append(nal); } } @@ -100,8 +106,7 @@ public class Annotate3D } else { - throw new IOException( - "Unexpected exception when handling RNAML translation of PDB data", + throw new IOException(MessageManager.getString("exception.unexpected_handling_rnaml_translation_for_pdb"), x); } }