diff src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java @ 46:fd3643699f83

modified pom.xml. fix conflict log4j libraries
author one
date Fri, 12 Jul 2013 11:27:00 +0900
parents 12d87bb4b84d
children a89c3539bff2
line wrap: on
line diff
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Fri Jul 12 09:47:22 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Fri Jul 12 11:27:00 2013 +0900
@@ -37,14 +37,16 @@
 	private final String treeName;
 	private final TreeEditor editor;
 	private final TreeOperationLog log;
+	private final String serverName;
 
-	public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor)
+	public NetworkDefaultJungleTreeEditor(String _serverName, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor)
 	{
-		this(_treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
+		this(_serverName, _treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
 	}
 	
-	public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor,TreeOperationLog _log)
+	public NetworkDefaultJungleTreeEditor(String _serverName, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor, TreeOperationLog _log)
 	{
+		serverName = _serverName;
 		treeName = _treeName;
 		root = _root;
 		txManager = _txManager;
@@ -74,7 +76,7 @@
 		DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length());
 		TreeOperationLog newTreeOpLog = log.append(treeOperationLog);
 		
-		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, newNode,txManager,editor,newTreeOpLog);
+		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(serverName, treeName, newNode,txManager,editor,newTreeOpLog);
 		return DefaultEither.newB(newEditor);
 	}
 	
@@ -121,7 +123,7 @@
 		}
 		
 		TransactionManager<T> newTxManager = either.b();
-		JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, root,newTxManager,editor);
+		JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(serverName, treeName, root,newTxManager,editor);
 		
 		return DefaultEither.newB(newTreeEditor);
 	}
@@ -147,6 +149,14 @@
 	public TreeOperationLog getTreeOperationLog() {
 		return log;
 	}
+	
+	public String getTreeName() {
+		return treeName;
+	}
+	
+	public String getServerName() {
+		return serverName;
+	}
 
 	
 }