X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FAnnotate3D.java;h=509d4ae91f1487d941fa56fa5100c7abd5803ed9;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=d0712da8ba6aa878d66b6faa85887209af115c88;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/ws/jws1/Annotate3D.java b/src/jalview/ws/jws1/Annotate3D.java index d0712da..509d4ae 100644 --- a/src/jalview/ws/jws1/Annotate3D.java +++ b/src/jalview/ws/jws1/Annotate3D.java @@ -1,5 +1,5 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. @@ -25,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; @@ -82,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); } } @@ -103,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); } }