X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FVamsasAppDatastore.java;h=1cab8ca897b315b96af5ef62922f0f01d60a1cfe;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=4e224984d5f69e80de53d61c7b1271f50aad469e;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git diff --git a/src/jalview/io/VamsasAppDatastore.java b/src/jalview/io/VamsasAppDatastore.java index 4e22498..1cab8ca 100644 --- a/src/jalview/io/VamsasAppDatastore.java +++ b/src/jalview/io/VamsasAppDatastore.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1) - * Copyright (C) 2015 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. * @@ -43,7 +43,6 @@ import java.util.Hashtable; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.List; -import java.util.Set; import java.util.Vector; import java.util.jar.JarInputStream; import java.util.jar.JarOutputStream; @@ -1433,7 +1432,7 @@ public class VamsasAppDatastore // to the align frames. boolean gathered = false; String newviewid = null; - Set mappings = av.getAlignment() + List mappings = av.getAlignment() .getCodonFrames(); for (int i = 0; i < views.length; i++) { @@ -1943,7 +1942,7 @@ public class VamsasAppDatastore TreePanel tp = null; if (vstree.isValidTree()) { - tp = alignFrame.ShowNewickTree(vstree.getNewickTree(), + tp = alignFrame.showNewickTree(vstree.getNewickTree(), vstree.getTitle(), vstree.getInputData(), 600, 500, t * 20 + 50, t * 20 + 50); @@ -2732,7 +2731,7 @@ public class VamsasAppDatastore } // Store any sequence mappings. - Set cframes = av.getAlignment().getCodonFrames(); + List cframes = av.getAlignment().getCodonFrames(); if (cframes != null) { for (AlignedCodonFrame acf : cframes)