From: jprocter <Jim Procter>
Date: Tue, 10 Oct 2006 14:07:12 +0000 (+0000)
Subject: bugfix for dodgy trees which contain the same leafname more than once - so that all... 
X-Git-Tag: Release_2_2~292
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1d43daa6b42cc3f1dd126f0a587473a39003021b;p=jalview.git

bugfix for dodgy trees which contain the same leafname more than once - so that all leaves in the tree are properly associated.
---

diff --git a/src/jalview/analysis/NJTree.java b/src/jalview/analysis/NJTree.java
index 1ab9c02..3f5f442 100755
--- a/src/jalview/analysis/NJTree.java
+++ b/src/jalview/analysis/NJTree.java
@@ -132,6 +132,7 @@ public class NJTree
         SequenceNode j;
         SequenceI nam;
         String realnam;
+        Vector one2many=new Vector();
 
         while (i < leaves.size())
         {
@@ -147,7 +148,13 @@ public class NJTree
             if (nam != null)
             {
                 j.setElement(nam);
-                namesleft--;
+                if (one2many.contains(nam)) {
+                  if (jalview.bin.Cache.log.isDebugEnabled())
+                    jalview.bin.Cache.log.debug("One 2 many relationship for "+nam.getName());
+                } else {
+                  one2many.addElement(nam);
+                  namesleft--;
+                }
             }
             else
             {
@@ -155,6 +162,10 @@ public class NJTree
                 j.setPlaceholder(true);
             }
         }
+        if (jalview.bin.Cache.log.isDebugEnabled()) {
+          jalview.bin.Cache.log.debug("There were "+one2many.size()+" alignment sequences linked to two or more leaves.");
+        }
+        one2many.clear();
     }
 
     /**