Merge branch 'jims/bug/JAL-4298_java_console_causing_hang_at_startup' into develop

[jalview.git] / src / jalview / io / packed / JalviewDataset.java

diff --git a/src/jalview/io/packed/JalviewDataset.java b/src/jalview/io/packed/JalviewDataset.java
index 63263d2..5248a16 100644 (file)
--- 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<String, FeatureColourI> fc,
-          Hashtable seqDets)
+          Map<String, FeatureColourI> 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<String, FeatureColourI> fc,
-          Hashtable seqDets, AlignmentI parentAlignment)
+          Map<String, FeatureColourI> fc, Hashtable seqDets,
+          AlignmentI parentAlignment)
   {
     this();
     parentDataset = aldataset;
@@ -292,7 +291,7 @@ public class JalviewDataset
     AlignmentSet last = getLastAlignmentSet();
     if (last != null)
     {
-      System.err.println("Deuniquifying last alignment set.");
+      jalview.bin.Console.errPrintln("Deuniquifying last alignment set.");
       last.deuniquifyAlignment();
     }
     al.add(new AlignmentSet(newal));