X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FAnnotate3D.java;h=bae03577e8aff3ebaaeb7390a6cb7a4c4c02dab8;hb=fa1b96bdca9954d44de8ed08e106ace44dcf66c3;hp=465c5fc672ee9884ec092272c1a88f353b977f20;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/ws/jws1/Annotate3D.java b/src/jalview/ws/jws1/Annotate3D.java index 465c5fc..bae0357 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-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,11 +20,12 @@ */ package jalview.ws.jws1; -import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; +import jalview.io.FileFormat; import jalview.io.FileParse; import jalview.io.FormatAdapter; import jalview.io.InputStreamParser; +import jalview.util.MessageManager; import java.io.BufferedReader; import java.io.FileReader; @@ -86,7 +87,8 @@ public class Annotate3D while (r.hasNext()) { FileParse fp = new InputStreamParser(r.next(), source.getDataName()); - AlignmentI nal = new FormatAdapter().readFromFile(fp, "RNAML"); + AlignmentI nal = new FormatAdapter().readFromFile(fp, + FileFormat.Rnaml); if (al == null) { al = nal; @@ -106,7 +108,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); } }