Mercurial > hg > Database > jungle-network

diff src/main/java/alice/jungle/transaction/NetworkTransactionManager.java @ 179:2828205bdc3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fit JungleCore
author tatsuki
date Sat, 13 Sep 2014 12:54:02 +0900
parents d6944d788121
children 4493dd7692ce
line wrap: on
line diff
--- a/src/main/java/alice/jungle/transaction/NetworkTransactionManager.java	Thu Sep 04 13:12:25 2014 +0900
+++ b/src/main/java/alice/jungle/transaction/NetworkTransactionManager.java	Sat Sep 13 12:54:02 2014 +0900
@@ -2,6 +2,8 @@
 
 import java.util.Iterator;
 
+import fj.data.List;
+import fj.data.TreeMap;
 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;
@@ -40,7 +42,7 @@
 	}
 	
 	@Override
-	public Either<Error, TransactionManager> commit(TreeNode _newRoot,final TreeOperationLog _log) {
+	public Either<Error, TransactionManager> commit(TreeNode _newRoot,final TreeOperationLog _log, TreeMap<String,TreeMap<String, List<TreeNode>>> index) {
 		ChangeSet cs = tip.getChangeSet();
 		long currentRevision = cs.revision();
 		long nextRevision = currentRevision + 1;
@@ -61,7 +63,7 @@
 		};
 		
 		TreeNode root = _newRoot;
-		DefaultChangeSet newCs = new DefaultChangeSet(root, cs, list, uuid, treeName, nextRevision);
+		DefaultChangeSet newCs = new DefaultChangeSet(root, cs, list, uuid, treeName, nextRevision, null);
 		DefaultTreeContext newContext = new DefaultTreeContext(_newRoot,newCs);
 		
 		@SuppressWarnings("rawtypes")