# HG changeset patch
# User one
# Date 1384762097 -32400
# Node ID dcd767b76f8d8512ae840ab2cdda8df0362c48f4
# Parent  47e337fc4086b28fcf628ad5c4eed14acc5e0bbf
Modified putDataSement for to use NetworkTreeOperationLog

diff -r 47e337fc4086 -r dcd767b76f8d src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Fri Nov 15 12:36:36 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Mon Nov 18 17:08:17 2013 +0900
@@ -5,6 +5,7 @@
 import java.nio.ByteBuffer;
 
 import alice.jungle.datasegment.store.container.DefaultTreeOperationLogContainer;
+import alice.jungle.operations.NetworkTreeOperationLog;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
@@ -24,7 +25,6 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.PutAttribute;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TransactionManager;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultEither;
-
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.IterableConverter;
@@ -178,19 +178,9 @@
 	}
 	
 	public void putDataSegment(String _uuid, String _treeName, String _updaterName, Iterable<TreeOperation> newLog, String nextRevision) throws IOException {
-		DefaultTreeOperationLogContainer container = new DefaultTreeOperationLogContainer();
-		container.setTreeName(_treeName);
-		container.setUUID(_uuid);
-		container.setUpdaterName(_updaterName);
-		container.setRevision(nextRevision);
-		container.unconvert(newLog);
+		NetworkTreeOperationLog netLog = new NetworkTreeOperationLog(_uuid, _treeName,newLog);
 		HashLogUpdateCodeSegment cs = new HashLogUpdateCodeSegment();
-		cs.ods.put("log", container);
-		cs.ods.put("logString", container.getHashLogString());
-		/* If this node is not Root node, push log to parent node's DS */
-		if(!_updaterName.equals("node0")) {
-			cs.ods.put("parent", "childLog", container);
-		}
+		cs.ods.put("log", netLog);
 	}
 
 	
diff -r 47e337fc4086 -r dcd767b76f8d src/jungle/app/bbs/JungleManager.java
--- a/src/jungle/app/bbs/JungleManager.java	Fri Nov 15 12:36:36 2013 +0900
+++ b/src/jungle/app/bbs/JungleManager.java	Mon Nov 18 17:08:17 2013 +0900
@@ -98,7 +98,7 @@
 			}
 		}
 		JungleTree tree = jungle.getTreeByName(treeName);
-		JungleTreeEditor editor = tree.getTreeEditor();
+		JungleTreeEditor editor = tree.getLocalTreeEditor();
 		int pos = calculatePosition(tree.getRootNode(), container.getTimeStamp());
 		Either<Error, JungleTreeEditor> either = JungleManager.edit(editor, log, pos);
 		if(either.isA()) {