X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2FPhylogenyNode.java;fp=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2FPhylogenyNode.java;h=15b307037a7fd01376d992a2c66d5b6879d43d6a;hb=1706deea223bc1a30d170596192d726b6847b7eb;hp=25b33d79650d9cb4db8d1dae9e5914ebbb53b47d;hpb=20ce9361380c461b8a7053100207034314e56e23;p=jalview.git diff --git a/forester/java/src/org/forester/phylogeny/PhylogenyNode.java b/forester/java/src/org/forester/phylogeny/PhylogenyNode.java index 25b33d7..15b3070 100644 --- a/forester/java/src/org/forester/phylogeny/PhylogenyNode.java +++ b/forester/java/src/org/forester/phylogeny/PhylogenyNode.java @@ -225,6 +225,9 @@ public final class PhylogenyNode implements Comparable { if ( !getName().equals( other.getName() ) ) { return false; } + if (getId() != other.getId()) { + return false; + } final NodeData this_data = getNodeData(); final NodeData other_data = other.getNodeData(); if ( ( this_data.isHasSequence() && other_data.isHasSequence() ) @@ -602,7 +605,7 @@ public final class PhylogenyNode implements Comparable { if ( ( getName().length() < 1 ) && !data.isHasSequence() && !data.isHasTaxonomy() ) { return super.hashCode(); } - int result = getName().hashCode(); + int result = getName().hashCode() * (int) getId(); if ( data.isHasSequence() ) { result ^= data.getSequence().hashCode(); }