JAL-2805 added static method for logging duplications when using map.put

diff --git a/src/jalview/ext/archaeopteryx/AptxNodeAssociation.java b/src/jalview/ext/archaeopteryx/AptxNodeAssociation.java
index 5d126f3..d5262c5 100644 (file)
--- a/src/jalview/ext/archaeopteryx/AptxNodeAssociation.java
+++ b/src/jalview/ext/archaeopteryx/AptxNodeAssociation.java
@@ -50,8 +50,6 @@ public class AptxNodeAssociation
   {
     SequenceIdMatcher algnIds = new SequenceIdMatcher(alignSequences);
 
-
-
     List<PhylogenyNode> leaves = tree.getExternalNodes();
     SequenceI nodeSequence;
     String nodeSequenceName;
@@ -67,8 +65,12 @@ public class AptxNodeAssociation
                 .createForesterSequence(nodeSequence, true);
         treeNode.getNodeData().setSequence(foresterNodeSeq);
 
-        alignmentWithNodes.put(nodeSequence, treeNode);
-        nodesWithAlignment.put(treeNode, nodeSequence);
+        ExternalTreeBuilderI.putWithDuplicationCheck(alignmentWithNodes,
+                nodeSequence, treeNode);
+        ExternalTreeBuilderI.putWithDuplicationCheck(nodesWithAlignment,
+                treeNode, nodeSequence);
+
+
       }
 
     }

diff --git a/src/jalview/ext/archaeopteryx/ExternalTreeBuilderI.java b/src/jalview/ext/archaeopteryx/ExternalTreeBuilderI.java
index 17ae7f8..d30be0e 100644 (file)
--- a/src/jalview/ext/archaeopteryx/ExternalTreeBuilderI.java
+++ b/src/jalview/ext/archaeopteryx/ExternalTreeBuilderI.java
@@ -28,4 +28,30 @@ interface ExternalTreeBuilderI<T, N>
 
   public String generateTreeName();
 
+  /**
+   * probably move
+   * 
+   * @param map
+   * @param key
+   * @param value
+   * @return
+   */
+  static <K, V> Map<K, V> putWithDuplicationCheck(Map<K, V> map, K key,
+          V value)
+  {
+    if (!map.containsKey(key))
+    {
+      map.put(key, value);
+    }
+    else
+    {
+      jalview.bin.Cache.log.warn(
+              "Attempt to add duplicate entry detected for map with key: "
+                      + key.toString() + " and value: " + value.toString());
+    }
+
+    return map;
+    
+  }
+
 }