Mercurial > hg > Members > tatsuki > bench > jungle-core
diff src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTransactionManager.java @ 73:e97a59269bf5
change to Various
author | one |
---|---|
date | Wed, 27 Aug 2014 01:02:11 +0900 |
parents | 57e965b73c9e |
children | a4e2f1d45fdc |
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTransactionManager.java Tue Aug 26 07:41:35 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTransactionManager.java Wed Aug 27 01:02:11 2014 +0900 @@ -32,9 +32,9 @@ } @Override - public Either<Error,TransactionManager<T>> commit(T _newRoot,final TreeOperationLog _log) + public Either<Error,TransactionManager<T>> commit(TreeNode<T> _newRoot,final TreeOperationLog _log) { - ChangeSet cs = tip.getChangeSet(); + ChangeSet<T> cs = tip.getChangeSet(); long currentRevision = cs.revision(); long nextRevision = currentRevision + 1; @@ -54,8 +54,8 @@ } }; - Node root = _newRoot.getAsNode(); - DefaultChangeSet newCs = new DefaultChangeSet(root,cs,list,uuid, _treeName, nextRevision); + TreeNode<T> root = _newRoot; + DefaultChangeSet<T> newCs = new DefaultChangeSet(root,cs,list,uuid, _treeName, nextRevision); DefaultTreeContext<T> newContext = new DefaultTreeContext<T>(_newRoot,newCs); @SuppressWarnings("rawtypes") @@ -81,7 +81,7 @@ @Override public long getRevision() { - ChangeSet cs = tip.getChangeSet(); + ChangeSet<T> cs = tip.getChangeSet(); return cs.revision(); } }