From 07107c59a739cf069c5357b412aaab5b4bda4b72 Mon Sep 17 00:00:00 2001 From: kjvdheide Date: Mon, 18 Dec 2017 15:50:59 +0000 Subject: [PATCH] JAL-2844 made null tree nodes return null wrappers so partitioning works --- src/jalview/ext/archaeopteryx/TreeNode.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/jalview/ext/archaeopteryx/TreeNode.java b/src/jalview/ext/archaeopteryx/TreeNode.java index 13ee7d0..e37f89d 100644 --- a/src/jalview/ext/archaeopteryx/TreeNode.java +++ b/src/jalview/ext/archaeopteryx/TreeNode.java @@ -146,6 +146,10 @@ public class TreeNode implements ExternalTreeNodeI public static ExternalTreeNodeI getUniqueWrapper( PhylogenyNode aptxNode) { + if (aptxNode == null) + { + return null; + } ExternalTreeNodeI wrappedNode = originalNodes.get(aptxNode); if (wrappedNode == null) { @@ -166,6 +170,10 @@ public class TreeNode implements ExternalTreeNodeI */ protected static PhylogenyNode unwrapNode(ExternalTreeNodeI wrappedNode) { + if (wrappedNode == null) + { + return null; + } PhylogenyNode aptxNode = wrappedNodes.get(wrappedNode); if (aptxNode == null) { -- 1.7.10.2