JAL-1953 node comparing now includes checking node IDs to prevent false

duplicate keys in the node hashmaps

diff --git a/src/jalview/ext/archaeopteryx/TreeNode.java b/src/jalview/ext/archaeopteryx/TreeNode.java
index 914cdd2..1205062 100644 (file)
--- a/src/jalview/ext/archaeopteryx/TreeNode.java
+++ b/src/jalview/ext/archaeopteryx/TreeNode.java
@@ -30,6 +30,7 @@ public class TreeNode implements ExternalTreeNodeI
     node = aptxNode;
     originalNodes.put(aptxNode, this);
     wrappedNodes.put(this, aptxNode);
+    System.out.println(getId());
 
   }
 
@@ -209,6 +210,10 @@ public class TreeNode implements ExternalTreeNodeI
       {
         return false;
       }
+      else if (getId() != other.getId())
+      {
+        return false;
+      }
     }
     else if (!node.equals(other.node))
     {

diff --git a/src/jalview/ext/treeviewer/ExternalTreeNodeI.java b/src/jalview/ext/treeviewer/ExternalTreeNodeI.java
index 1481b06..bdf3b8d 100644 (file)
--- a/src/jalview/ext/treeviewer/ExternalTreeNodeI.java
+++ b/src/jalview/ext/treeviewer/ExternalTreeNodeI.java
@@ -7,7 +7,6 @@ import java.util.List;
 
 public interface ExternalTreeNodeI
 {
-  final static int nodeCount = 0;
 
   public String getNodeName();
 
@@ -31,8 +30,4 @@ public interface ExternalTreeNodeI
 
   public boolean isInternal();
 
-  public static int getTotalNodes()
-  {
-    return nodeCount;
-  }
 }