Mercurial > hg > Members > shoshi > TreeCMSv2
diff src/treecms/memory/OnMemoryForest.java @ 4:f5ed85be5640
finished treecms.cassandra.v1 implementation (not tested yet)
author | shoshi |
---|---|
date | Thu, 24 Feb 2011 21:30:18 +0900 |
parents | 5fa718b63cd5 |
children | 12604eb6b615 |
line wrap: on
line diff
--- a/src/treecms/memory/OnMemoryForest.java Fri Feb 18 02:14:10 2011 +0900 +++ b/src/treecms/memory/OnMemoryForest.java Thu Feb 24 21:30:18 2011 +0900 @@ -6,6 +6,7 @@ import java.util.concurrent.ConcurrentHashMap; import treecms.api.Forest; import treecms.api.Node; +import treecms.api.NodeData; import treecms.api.NodeID; import treecms.tree.id.RandomNodeID; @@ -18,16 +19,12 @@ m_table = new ConcurrentHashMap<NodeID,OnMemoryNode>(); } - public OnMemoryNode createNode(NodeID _id) + public OnMemoryNode createNode(NodeID _id,NodeData _newData) { - OnMemoryNode newNode; - if(_id == null){ - newNode = new OnMemoryNode(this,createID()); - }else{ - newNode = new OnMemoryNode(this,_id); - } - m_table.put(newNode.getID(),newNode); - + NodeID newID = (_id != null) ? _id : createID(); + NodeData newData = (_newData != null) ? _newData : new NodeData(); + OnMemoryNode newNode = new OnMemoryNode(this,newID,newData); + m_table.put(newID,newNode); return newNode; } @@ -45,7 +42,7 @@ @Override public Node create() { - return createNode(null); + return createNode(null,null); } class RandomNodeIDImpl extends RandomNodeID