diff src/treecms/memory/OnMemoryMonotonicTree.java @ 17:168deb591f21

commit
author shoshi
date Tue, 24 May 2011 00:33:12 +0900
parents bb9760760744
children f3150b37f9be
line wrap: on
line diff
--- a/src/treecms/memory/OnMemoryMonotonicTree.java	Sat May 21 04:46:00 2011 +0900
+++ b/src/treecms/memory/OnMemoryMonotonicTree.java	Tue May 24 00:33:12 2011 +0900
@@ -1,7 +1,9 @@
 package treecms.memory;
 
 import treecms.api.MonotonicTree;
+
 import treecms.api.MonotonicTreeNode;
+import treecms.api.SingleNode;
 import treecms.api.Tree;
 import treecms.merger.Merger;
 import treecms.merger.ReplaceMerger;
@@ -11,12 +13,13 @@
 	private volatile OnMemoryTree m_tree;
 	private OnMemoryNode m_old;
 	private OnMemoryMonotonicTreeNode m_root;
+	private static final Merger<SingleNode> m_merger = new ReplaceMerger<SingleNode>();
 	
 	public OnMemoryMonotonicTree(OnMemoryTree _tree)
 	{
 		m_tree = _tree;
 		m_old = (OnMemoryNode)m_tree.getRoot().getNode();
-		m_root = new OnMemoryMonotonicTreeNode((OnMemoryNode)m_old,this);
+		m_root = new OnMemoryMonotonicTreeNode((OnMemoryNode)m_old,null);
 	}
 
 	@Override
@@ -42,6 +45,7 @@
 	public void merge()
 	{
 		//merge here
+		m_old = (OnMemoryNode)m_merger.merge(m_tree.getRoot().getNode(),m_root.getNode());
 	}
 
 	@Override