diff src/jungle/test/core/practice/LogReadCodeSegment.java @ 30:8593c2525aa7

add NeworkTransactionManager
author one
date Mon, 01 Jul 2013 20:31:29 +0900
parents 16ea4835f36e
children 190f6a3bdab2
line wrap: on
line diff
--- a/src/jungle/test/core/practice/LogReadCodeSegment.java	Mon Jul 01 19:36:17 2013 +0900
+++ b/src/jungle/test/core/practice/LogReadCodeSegment.java	Mon Jul 01 20:31:29 2013 +0900
@@ -9,13 +9,13 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.DefaultTreeOperationLog;
+import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.TreeOperationLog;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
 import jungle.test.codesegment.operation.JungleManager;
 import jungle.test.datasegment.store.operations.DefaultTreeOperationLogContainer;
-import jungle.test.transaction.NetworkDefaultJungleTreeEditor;
 import alice.codesegment.CodeSegment;
 import alice.datasegment.CommandType;
 import alice.datasegment.Receiver;
@@ -38,25 +38,33 @@
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		JungleManager jm = new JungleManager();
-		Jungle jungle = jm.getJungle();
+		Jungle jungle = new JungleManager().getJungle();
 		JungleTree tree = jungle.getTreeByName("tree");
 		JungleTreeEditor editor = tree.getTreeEditor();
+		Either<Error, JungleTreeEditor> either = edit(editor, log);
+		if (either.isA()) {
+			throw new IllegalStateException();				
+		}
+		editor = either.b();
+		editor.success();
+		new PrintChildrenAttribute("key1");
+		ods.update("key1", "key1");
+	}
+	
+	private Either<Error, JungleTreeEditor> edit(JungleTreeEditor _editor ,TreeOperationLog _log) {
+		JungleTreeEditor editor = _editor;
 		Either<Error, JungleTreeEditor> either = null;
-		for (TreeOperation op : log) { 
-			either = edit(editor, op);
+		for (TreeOperation op : _log) { 
+			either = _edit(editor, op);
 			if(either.isA()) {
-				throw new IllegalStateException();				
+				return either;
 			}
 			editor = either.b();
 		}
-		editor.success();
-		new PrintChildrenAttribute("key1");
-		ods.update("key1", "key1");
-		
+		return either;
 	}
 	
-	public Either<Error, JungleTreeEditor> edit(JungleTreeEditor editor,
+	private Either<Error, JungleTreeEditor> _edit(JungleTreeEditor editor,
 			TreeOperation op) {
 		NodePath path = op.getNodePath();
 		NodeOperation nodeOp = op.getNodeOperation();