diff src/main/java/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java @ 176:6f104ab4eb81

fit jungle core but editMessage is not work
author tatsuki
date Mon, 01 Sep 2014 00:04:32 +0900
parents 7d9b7fcb4d9a
children d6944d788121
line wrap: on
line diff
--- a/src/main/java/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Wed Jul 30 22:17:23 2014 +0900
+++ b/src/main/java/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Mon Sep 01 00:04:32 2014 +0900
@@ -8,7 +8,6 @@
 import alice.jungle.operations.NetworkTreeOperationLog;
 import app.bbs.codesegment.LogPutCodeSegment;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
@@ -30,21 +29,21 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.IterableConverter;
 
-public class NetworkDefaultJungleTreeEditor<T extends TreeNode<T>> implements JungleTreeEditor {
+public class NetworkDefaultJungleTreeEditor<T extends TreeNode> implements JungleTreeEditor {
 
 	private final TransactionManager<T> txManager;
-	private final T root;
+	private final TreeNode root;
 	private final TreeEditor editor;
 	private final String treeName;
 	private final TreeOperationLog log;
 	private boolean exportLog;
 
-	public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor)
+	public NetworkDefaultJungleTreeEditor(String _treeName, TreeNode _root,TransactionManager<T> _txManager,TreeEditor _editor)
 	{
 		this(_treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
 	}
 	
-	public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor, TreeOperationLog _log)
+	public NetworkDefaultJungleTreeEditor(String _treeName, TreeNode _root,TransactionManager<T> _txManager,TreeEditor _editor, TreeOperationLog _log)
 	{
 		treeName = _treeName;
 		root = _root;
@@ -54,13 +53,13 @@
 		exportLog = true;
 	}
 	
-	public static <T1 extends TreeNode<T1>> NetworkDefaultJungleTreeEditor<T1> NewLocalJungleTreeEditor(String _treeName, T1 _root,TransactionManager<T1> _txManager,TreeEditor _editor) {
+	public static <T1 extends TreeNode> NetworkDefaultJungleTreeEditor<T1> NewLocalJungleTreeEditor(String _treeName, TreeNode _root,TransactionManager<T1> _txManager,TreeEditor _editor) {
 		NetworkDefaultJungleTreeEditor<T1> treeEditor = new NetworkDefaultJungleTreeEditor<T1>(_treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
 		treeEditor.exportLog = false;
 		return treeEditor;
 	}
 
-	public static <T1 extends TreeNode<T1>> NetworkDefaultJungleTreeEditor<T1> NewLocalJungleTreeEditor(String _treeName, T1 _root,TransactionManager<T1> _txManager,TreeEditor _editor, TreeOperationLog _log) {
+	public static <T1 extends TreeNode> NetworkDefaultJungleTreeEditor<T1> NewLocalJungleTreeEditor(String _treeName, TreeNode _root,TransactionManager<T1> _txManager,TreeEditor _editor, TreeOperationLog _log) {
 		NetworkDefaultJungleTreeEditor<T1> treeEditor = new NetworkDefaultJungleTreeEditor<T1>(_treeName, _root,_txManager,_editor,_log);
 		treeEditor.exportLog = false;
 		return treeEditor;
@@ -69,12 +68,12 @@
 	private Either<Error,JungleTreeEditor> _edit(final NodePath _path,NodeEditor _e)
 	{
 		LoggingNodeHook hook = new LoggingNodeHook(_e);
-		Either<Error,T> either = editor.edit(root,_path,hook);
+		Either<Error,TreeNode> either = editor.edit(root,_path,hook);
 		if(either.isA()){
 			return DefaultEither.newA(either.a());
 		}
 		
-		T newNode = either.b();
+		TreeNode newNode = either.b();
 		OperationLog newLog = hook.getLog();
 		
 		IterableConverter.Converter<TreeOperation,NodeOperation> converter = new IterableConverter.Converter<TreeOperation,NodeOperation>(){
@@ -165,9 +164,9 @@
 	}
 
 	@Override
-	public Node getRoot()
+	public TreeNode getRoot()
 	{
-		return root.getAsNode();
+		return root;
 	}
 	
 	public String getTreeName() {