diff src/treecms/memory/OnMemoryForest.java @ 15:22cd920986c5

commit
author misaka
date Tue, 17 May 2011 21:25:17 +0900
parents 85061e874775
children bb9760760744
line wrap: on
line diff
--- a/src/treecms/memory/OnMemoryForest.java	Tue May 17 18:44:14 2011 +0900
+++ b/src/treecms/memory/OnMemoryForest.java	Tue May 17 21:25:17 2011 +0900
@@ -5,9 +5,9 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import treecms.api.Forest;
-import treecms.api.Node;
 import treecms.api.NodeData;
 import treecms.api.NodeID;
+import treecms.api.SingleNode;
 import treecms.api.Tree;
 import treecms.api.MonotonicTree;
 import treecms.tree.id.AbstractRandomNodeID;
@@ -43,10 +43,10 @@
 	 * @param _newData Nodeが保持するNodeData
 	 * @return 作成されたOnMemoryNode
 	 */
-	public OnMemoryNode createNode(NodeID _id,NodeData _newData)
+	public OnMemoryNode createNode(NodeID _id,NodeData<SingleNode> _newData)
 	{
 		NodeID newID = (_id != null) ? _id : createID();
-		NodeData newData = (_newData != null) ? _newData : new NodeData();
+		NodeData<SingleNode> newData = (_newData != null) ? _newData : new NodeData<SingleNode>();
 		
 		//newIDとnewDataを元にOnMemoryNodeを生成する.
 		OnMemoryNode newNode = new OnMemoryNode(this,newID,newData);
@@ -72,7 +72,7 @@
 	 * @return NodeIDに対応するNode
 	 */
 	@Override
-	public Node get(NodeID _id)
+	public SingleNode get(NodeID _id)
 	{
 		return m_table.get(_id);
 	}
@@ -83,7 +83,7 @@
 	 * @return Tree
 	 */
 	@Override
-	public Tree getTree(Node _node)
+	public Tree getTree(SingleNode _node)
 	{
 		Forest forest = _node.getForest();
 		if(forest != this){
@@ -99,14 +99,14 @@
 	 * @return TreeEditor
 	 */
 	@Override
-	public MonotonicTree getMonotonicTree(Tree _tree)
+	public MonotonicTree getMonotonicTree(SingleNode _node)
 	{
-		Forest forest = _tree.getRoot().getNode().getForest();
+		Forest forest = _node.getForest();
 		if(forest != this){
 			throw new IllegalArgumentException();
 		}
 		
-		return new OnMemoryMonotonicTree((OnMemoryTree)_tree);
+		return new OnMemoryMonotonicTree((OnMemoryNode)_node);
 	}
 	
 	/**
@@ -114,7 +114,7 @@
 	 * @return 新しいNode
 	 */
 	@Override
-	public Node create()
+	public SingleNode create()
 	{
 		return createNode(null,null);
 	}
@@ -124,7 +124,7 @@
 	 * @return NodeDataを保持した新しいNode 
 	 */
 	@Override
-	public Node create(NodeData _data)
+	public SingleNode create(NodeData<SingleNode> _data)
 	{
 		return createNode(null,_data);
 	}
@@ -134,7 +134,7 @@
 	 * @return UUIDに対応する最新のNode
 	 */
 	@Override
-	public Node getTip(String _uuid)
+	public SingleNode getTip(String _uuid)
 	{
 		return m_tipTable.get(_uuid);
 	}