Mercurial > hg > Members > shoshi > TreeCMSv2
diff src/treecms/memory/OnMemoryMonotonicTree.java @ 23:77a894c0b919
commit
author | shoshi |
---|---|
date | Thu, 09 Jun 2011 01:03:48 +0900 |
parents | fa784faafc78 |
children | c1e7ec6b3d44 |
line wrap: on
line diff
--- a/src/treecms/memory/OnMemoryMonotonicTree.java Tue Jun 07 16:42:49 2011 +0900 +++ b/src/treecms/memory/OnMemoryMonotonicTree.java Thu Jun 09 01:03:48 2011 +0900 @@ -1,28 +1,30 @@ package treecms.memory; +import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import treecms.api.MonotonicTree; import treecms.api.MonotonicTreeNode; import treecms.api.Node; import treecms.api.NodeID; -import treecms.merger.Merger; -import treecms.merger.ReplaceMerger; +import treecms.api.NodeTable; import treecms.tree.util.NodeData; +import treecms.tree.util.NodeTableImpl; public class OnMemoryMonotonicTree implements MonotonicTree { - private final ConcurrentMap<String,OnMemoryNode> m_members; private final OnMemoryMonotonicTree m_tree; - - private OnMemoryMonotonicTreeNode m_root; + private final NodeTable m_table; + private final OnMemoryMonotonicTreeNode m_root; private OnMemoryMonotonicTree(OnMemoryNode _root,OnMemoryMonotonicTree _tree) { - m_members = new ConcurrentHashMap<String,OnMemoryNode>(); - m_members.put(_root.getID().getFamilyID(),_root); m_tree = _tree; + m_table = new NodeTableImpl(); + + NodeID id = _root.getID(); + String fid = id.getFamilyID(); + m_root = new OnMemoryMonotonicTreeNode(fid,null,m_table); } public static OnMemoryMonotonicTree createInstance(OnMemoryNode _root,OnMemoryMonotonicTree _tree) @@ -63,6 +65,9 @@ @Override public boolean check() { + if(m_tree != null){ + + } return m_tree.getRoot().getNode().equals(m_root.getNode()); }