X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fpacked%2FJalviewDataset.java;h=9f84c16235cf5d79116a61501dc6c2e3c50406aa;hb=e67e5f3a5b922e8a7729a0e9e9b174f46b11456c;hp=63263d2064f7125f012b1e53abb55b268ca9b57a;hpb=bf0d052fef43e9809b7170dbfd372b3ea116391b;p=jalview.git diff --git a/src/jalview/io/packed/JalviewDataset.java b/src/jalview/io/packed/JalviewDataset.java index 63263d2..9f84c16 100644 --- a/src/jalview/io/packed/JalviewDataset.java +++ b/src/jalview/io/packed/JalviewDataset.java @@ -20,6 +20,7 @@ */ package jalview.io.packed; +import jalview.analysis.TreeModel; import jalview.api.FeatureColourI; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; @@ -151,8 +152,7 @@ public class JalviewDataset { // the following works because all trees are already had node/SequenceI // associations created. - jalview.analysis.NJTree njt = new jalview.analysis.NJTree( - al.getSequencesArray(), nf); + TreeModel njt = new TreeModel(al.getSequencesArray(), null, nf); // this just updates the displayed leaf name on the tree according to // the SequenceIs. njt.renameAssociatedNodes(); @@ -211,8 +211,7 @@ public class JalviewDataset * @param parentAlignment */ public JalviewDataset(AlignmentI aldataset, - Map fc, - Hashtable seqDets) + Map fc, Hashtable seqDets) { // TODO not used - remove? this(aldataset, fc, seqDets, null); @@ -234,8 +233,8 @@ public class JalviewDataset * with. */ public JalviewDataset(AlignmentI aldataset, - Map fc, - Hashtable seqDets, AlignmentI parentAlignment) + Map fc, Hashtable seqDets, + AlignmentI parentAlignment) { this(); parentDataset = aldataset;