diff src/jungle/app/bbs/JungleManager.java @ 96:fcce7ca4adb9

Modified LogUpdateCodesegment
author one
date Mon, 18 Nov 2013 19:34:15 +0900
parents dcd767b76f8d
children 9865ccfd0123
line wrap: on
line diff
--- a/src/jungle/app/bbs/JungleManager.java	Mon Nov 18 17:08:17 2013 +0900
+++ b/src/jungle/app/bbs/JungleManager.java	Mon Nov 18 19:34:15 2013 +0900
@@ -5,6 +5,7 @@
 import java.util.Iterator;
 
 import alice.jungle.datasegment.store.container.DefaultTreeOperationLogContainer;
+import alice.jungle.operations.NetworkTreeOperationLog;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree;
@@ -83,14 +84,8 @@
 		return null;
 	}
 	
-	public static Either<Error, JungleTreeEditor> update(DefaultTreeOperationLogContainer container) {
-		DefaultTreeOperationLog log = null;
-		try {
-			log = container.convert();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		String treeName = container.getTreeName();
+	public static Either<Error, JungleTreeEditor> update(NetworkTreeOperationLog netLog) {
+		String treeName = netLog.getTreeName();
 		Jungle jungle = JungleManager.getJungle(); 
 		if (jungle.getTreeByName(treeName) == null) {
 			if(null == jungle.createNewTree(treeName)){
@@ -99,8 +94,10 @@
 		}
 		JungleTree tree = jungle.getTreeByName(treeName);
 		JungleTreeEditor editor = tree.getLocalTreeEditor();
-		int pos = calculatePosition(tree.getRootNode(), container.getTimeStamp());
-		Either<Error, JungleTreeEditor> either = JungleManager.edit(editor, log, pos);
+
+		//		int pos = calculatePosition(tree.getRootNode(), netLog.getTimeStamp());
+		int pos = 0;
+		Either<Error, JungleTreeEditor> either = JungleManager.edit(editor, netLog, pos);
 		if(either.isA()) {
 			throw new IllegalStateException();
 		}