Mercurial > hg > Members > nobuyasu > jungle-network

changeset 99:55a4f2bb44a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug NetworkDefaultJungle
author one
date Tue, 19 Nov 2013 16:28:29 +0900
parents 9865ccfd0123
children fac2eb0384a2
files aliceInstall.sh src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java
diffstat 3 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/aliceInstall.sh	Tue Nov 19 15:52:33 2013 +0900
+++ b/aliceInstall.sh	Tue Nov 19 16:28:29 2013 +0900
@@ -1,2 +1,2 @@
 #!/bin/sh
-mvn install:install-file -Dfile=$WORKSPACE_PATH/Alice/Alice.jar -DgroupId=alice -DartifactId=alice -Dversion=0.1 -Dpackagin=jar
\ No newline at end of file
+mvn install:install-file -Dfile=$WORKSPACE_PATH/Alice/Alice.jar -DgroupId=alice -DartifactId=alice -Dversion=0.1 -Dpackaging=jar
\ No newline at end of file
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Tue Nov 19 15:52:33 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Tue Nov 19 16:28:29 2013 +0900
@@ -58,6 +58,12 @@
 		treeEditor.exportLog = false;
 		return treeEditor;
 	}
+
+	public static <T1 extends TreeNode<T1>> NetworkDefaultJungleTreeEditor<T1> NewLocalJungleTreeEditor(String _treeName, T1 _root,TransactionManager<T1> _txManager,TreeEditor _editor, TreeOperationLog _log) {
+		NetworkDefaultJungleTreeEditor<T1> treeEditor = new NetworkDefaultJungleTreeEditor<T1>(_treeName, _root,_txManager,_editor,_log);
+		treeEditor.exportLog = false;
+		return treeEditor;
+	}
 	
 	private Either<Error,JungleTreeEditor> _edit(final NodePath _path,NodeEditor _e)
 	{
@@ -81,8 +87,12 @@
 		DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length());
 		TreeOperationLog newTreeOpLog = log.append(treeOperationLog);
 		
-		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, newNode,txManager,editor,newTreeOpLog);
-
+		JungleTreeEditor newEditor;
+		if(exportLog) {
+		  newEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, newNode,txManager,editor,newTreeOpLog);
+		} else {
+			newEditor = NetworkDefaultJungleTreeEditor.NewLocalJungleTreeEditor(treeName, newNode, txManager, editor, newTreeOpLog);
+		}
 		return DefaultEither.newB(newEditor);
 	}
 	
--- a/src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java	Tue Nov 19 15:52:33 2013 +0900
+++ b/src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java	Tue Nov 19 16:28:29 2013 +0900
@@ -46,6 +46,6 @@
 				ods.put(node, log.key, log.getVal());
 			}
 		}
-		new LogUpdateCodeSegment(index+1);
+		new LogUpdateCodeSegment(index);
 	}
 }