Mercurial > hg > Database > jungle-network
diff src/main/java/alice/jungle/transaction/NetworkTransactionManager.java @ 176:6f104ab4eb81
fit jungle core but editMessage is not work
author | tatsuki |
---|---|
date | Mon, 01 Sep 2014 00:04:32 +0900 |
parents | f9e29a52efd3 |
children | d6944d788121 |
line wrap: on
line diff
--- a/src/main/java/alice/jungle/transaction/NetworkTransactionManager.java Wed Jul 30 22:17:23 2014 +0900 +++ b/src/main/java/alice/jungle/transaction/NetworkTransactionManager.java Mon Sep 01 00:04:32 2014 +0900 @@ -2,7 +2,6 @@ import java.util.Iterator; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListWriter; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Result; @@ -21,7 +20,7 @@ import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error; -public class NetworkTransactionManager<T extends TreeNode<T>> implements TransactionManager<T> +public class NetworkTransactionManager<T extends TreeNode> implements TransactionManager<T> { private final AtomicReservableReference<TreeContext<T>> repository; @@ -41,7 +40,7 @@ } @Override - public Either<Error, TransactionManager<T>> commit(T _newRoot,final TreeOperationLog _log) { + public Either<Error, TransactionManager<T>> commit(TreeNode _newRoot,final TreeOperationLog _log) { ChangeSet cs = tip.getChangeSet(); long currentRevision = cs.revision(); long nextRevision = currentRevision + 1; @@ -61,7 +60,7 @@ } }; - Node root = _newRoot.getAsNode(); + TreeNode root = _newRoot; DefaultChangeSet newCs = new DefaultChangeSet(root, cs, list, uuid, treeName, nextRevision); DefaultTreeContext<T> newContext = new DefaultTreeContext<T>(_newRoot,newCs);