Mercurial > hg > Members > nobuyasu > jungle-network

changeset 32:2f1879e0acec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified to have tree name
author one
date Mon, 01 Jul 2013 20:54:07 +0900
parents 190f6a3bdab2
children afccf06c4063
files src/alice/jungle/core/NetworkDefaultJungle.java src/alice/jungle/transaction/NetworkDefaultJungleTree.java src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java src/alice/jungle/transaction/NetworkTransactionManager.java
diffstat 4 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/alice/jungle/core/NetworkDefaultJungle.java	Mon Jul 01 20:34:03 2013 +0900
+++ b/src/alice/jungle/core/NetworkDefaultJungle.java	Mon Jul 01 20:54:07 2013 +0900
@@ -53,7 +53,7 @@
 		DefaultTreeNode root = new DefaultTreeNode();
 		ChangeSet set = new DefaultChangeSet(root.getAsNode(),null,list,uuid,0);
 		DefaultTreeContext<DefaultTreeNode> tc = new DefaultTreeContext<DefaultTreeNode>(root,set);
-		JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(tc,uuid,journal.getWriter(),editor);
+		JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(_name, tc,uuid,journal.getWriter(),editor);
 		if(trees.putIfAbsent(_name,newTree) != null){
 			return null;
 		}
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTree.java	Mon Jul 01 20:34:03 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTree.java	Mon Jul 01 20:54:07 2013 +0900
@@ -14,11 +14,13 @@
 public class NetworkDefaultJungleTree<T extends TreeNode<T>> implements JungleTree {
 	private final AtomicReservableReference<TreeContext<T>> repository;
 	private final String uuid;
+	private final String treeName;
 	private final ChangeListWriter writer;
 	private final TreeEditor editor;
 	
-	public NetworkDefaultJungleTree(TreeContext<T> _tc,String _uuid,ChangeListWriter _writer,TreeEditor _editor)
+	public NetworkDefaultJungleTree(String _treeName, TreeContext<T> _tc,String _uuid,ChangeListWriter _writer,TreeEditor _editor)
 	{
+		treeName = _treeName;
 		repository = new AtomicReservableReference<TreeContext<T>>(_tc);
 		uuid = _uuid;
 		writer = _writer;
@@ -29,9 +31,9 @@
 	public JungleTreeEditor getTreeEditor()
 	{
 		TreeContext<T> tc = repository.get();
-		DefaultTransactionManager<T> txManager = new DefaultTransactionManager<T>(writer,tc,repository,uuid);
+		NetworkTransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer,tc,repository,uuid);
 		T root = tc.getTreeNode();
-		return new NetworkDefaultJungleTreeEditor<T>(root,txManager,editor);
+		return new NetworkDefaultJungleTreeEditor<T>(treeName, root,txManager,editor);
 	}
 
 	@Override
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Mon Jul 01 20:34:03 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Mon Jul 01 20:54:07 2013 +0900
@@ -30,16 +30,18 @@
 
 	private final TransactionManager<T> txManager;
 	private final T root;
+	private final String treeName;
 	private final TreeEditor editor;
 	private final TreeOperationLog log;
 
-	public NetworkDefaultJungleTreeEditor(T _root,TransactionManager<T> _txManager,TreeEditor _editor)
+	public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor)
 	{
-		this(_root,_txManager,_editor,new DefaultTreeOperationLog());
+		this(_treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
 	}
 	
-	public NetworkDefaultJungleTreeEditor(T _root,TransactionManager<T> _txManager,TreeEditor _editor,TreeOperationLog _log)
+	public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor,TreeOperationLog _log)
 	{
+		treeName = _treeName;
 		root = _root;
 		txManager = _txManager;
 		editor = _editor;
@@ -68,7 +70,7 @@
 		DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length());
 		TreeOperationLog newTreeOpLog = log.append(treeOperationLog);
 		
-		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(newNode,txManager,editor,newTreeOpLog);
+		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, newNode,txManager,editor,newTreeOpLog);
 		return DefaultEither.newB(newEditor);
 	}
 	
--- a/src/alice/jungle/transaction/NetworkTransactionManager.java	Mon Jul 01 20:34:03 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkTransactionManager.java	Mon Jul 01 20:54:07 2013 +0900
@@ -30,8 +30,8 @@
 	private final String uuid;	
 	private final String treeName;	
 	
-	public NetworkTransactionManager(ChangeListWriter _writer,TreeContext<T> _tip,
-			AtomicReservableReference<TreeContext<T>> _repository,String _uuid, String _treeName)
+	public NetworkTransactionManager(String _treeName, ChangeListWriter _writer,TreeContext<T> _tip,
+			AtomicReservableReference<TreeContext<T>> _repository,String _uuid)
 	{
 		repository = _repository;
 		tip = _tip;
@@ -65,10 +65,9 @@
 		Result r = writer.write(list);
 		if(r == Result.SUCCESS){
 			reservation.confirm();
-			TransactionManager<T> txManager = new NetworkTransactionManager<T>(writer, newContext, repository, uuid, treeName);
+			TransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer, newContext, repository, uuid);
 			return DefaultEither.newB(txManager);
 		}
-
 		return DefaultEither.newA((Error)new DefaultError());
 	}