X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FAnnotate3D.java;h=a17fe636e7ecaa2e8532d1f4aebbdfe0bc2933f9;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;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..a17fe63 100644 --- a/src/jalview/ws/jws1/Annotate3D.java +++ b/src/jalview/ws/jws1/Annotate3D.java @@ -1,6 +1,6 @@ /* - * 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 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -20,11 +20,11 @@ */ package jalview.ws.jws1; -import jalview.datamodel.Alignment; 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 +82,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); } } @@ -104,7 +106,8 @@ public class Annotate3D else { throw new IOException( - "Unexpected exception when handling RNAML translation of PDB data", + MessageManager + .getString("exception.unexpected_handling_rnaml_translation_for_pdb"), x); } }