X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=7810771fa907e5c1e8fb0cc113c5b3427d81d33a;hb=ebe0c31476d408f10e968bed024e898c02c7204e;hp=1633212d8b2b80e5a0cb36b68402b858d1ac54a8;hpb=9282440c3bafe52674446b861a6b43d9bcfa3664;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index 1633212..7810771 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -285,26 +285,10 @@ public class AppletFormatAdapter else if (format.equals(JSONFile.FILE_DESC)) { alignFile = new JSONFile(inFile, type); - al = new Alignment(alignFile.getSeqsAsArray()); - alignFile.addAnnotations(al); - ((JSONFile) alignFile).setViewport(viewport); - for (SequenceGroup sg : alignFile.getSeqGroups()) - { - al.addGroup(sg); - } - - return al; } else if (format.equals(HtmlFile.FILE_DESC)) { alignFile = new HtmlFile(inFile, type); - al = new Alignment(alignFile.getSeqsAsArray()); - alignFile.addAnnotations(al); - for (SequenceGroup sg : alignFile.getSeqGroups()) - { - al.addGroup(sg); - } - return al; } else if (format.equals("RNAML")) { @@ -314,11 +298,15 @@ public class AppletFormatAdapter { alignFile = new Gff3File(inFile, type); } - + // Standard boilerplate for creating alignment from parser + alignFile.setViewport(viewport); + al = new Alignment(alignFile.getSeqsAsArray()); alignFile.addAnnotations(al); + alignFile.addGroups(al); + return al; } catch (Exception e) {