# HG changeset patch # User tatsuki # Date 1485346693 -32400 # Node ID 0d11fd054893d6abc605749e8fa7827793b3cc9c # Parent c8a9bc5243a94d436231c3f19ebc65237780ac4c Red Black Tree fix diff -r c8a9bc5243a9 -r 0d11fd054893 src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/logger/TreeOperationLog.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/logger/TreeOperationLog.java Wed Jan 25 06:15:48 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/logger/TreeOperationLog.java Wed Jan 25 21:18:13 2017 +0900 @@ -6,7 +6,7 @@ public interface TreeOperationLog extends Iterable { - public TreeOperationLog add(NodePath _p,NodeOperation _op); + public TreeOperationLog add(NodePath _p, NodeOperation _op); public TreeOperationLog append(TreeOperationLog _log); public int length(); } diff -r c8a9bc5243a9 -r 0d11fd054893 src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/nodepath/NodePath.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/nodepath/NodePath.java Wed Jan 25 06:15:48 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/nodepath/NodePath.java Wed Jan 25 21:18:13 2017 +0900 @@ -2,13 +2,19 @@ import jp.ac.u_ryukyu.ie.cr.jungle.util.Pair; -public interface NodePath extends Iterable -{ - public int get(int index); - public NodePath add(int pos); - public Pair pop(); - public NodePath tail(); - public int size(); - public Pair last(); + +public interface NodePath extends Iterable { + public int get(int index); + + public NodePath add(int pos); + + public Pair pop(); + + public NodePath tail(); + + public int size(); + + public Pair last(); + public NodePath addHead(int pos); -} +} \ No newline at end of file diff -r c8a9bc5243a9 -r 0d11fd054893 src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/operations/DefaultTreeOperation.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/operations/DefaultTreeOperation.java Wed Jan 25 06:15:48 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/operations/DefaultTreeOperation.java Wed Jan 25 21:18:13 2017 +0900 @@ -7,7 +7,7 @@ private final NodePath path; private final NodeOperation operation; - public DefaultTreeOperation(NodePath _path,NodeOperation _operation) + public DefaultTreeOperation(NodePath _path, NodeOperation _operation) { path = _path; operation = _operation; diff -r c8a9bc5243a9 -r 0d11fd054893 src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/DifferenceTreeEditor.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/DifferenceTreeEditor.java Wed Jan 25 06:15:48 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/DifferenceTreeEditor.java Wed Jan 25 21:18:13 2017 +0900 @@ -20,7 +20,7 @@ } @Override - public Either edit(TreeNode subTreeRoot, NodePath path, NodeEditor editor) { + public Either edit(TreeNode subTreeRoot, NodePath path, NodeEditor editor) { Evaluator evalutor = new DefaultEvaluator(path); Either traverseEither = traverser.traverse(subTreeRoot, evalutor); if (traverseEither.isA()) { diff -r c8a9bc5243a9 -r 0d11fd054893 src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/TreeEditor.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/TreeEditor.java Wed Jan 25 06:15:48 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/TreeEditor.java Wed Jan 25 21:18:13 2017 +0900 @@ -9,5 +9,5 @@ public interface TreeEditor { - public Either edit(TreeNode root, NodePath path, NodeEditor editor) ; + public Either edit(TreeNode root, NodePath path, NodeEditor editor) ; } diff -r c8a9bc5243a9 -r 0d11fd054893 src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java Wed Jan 25 06:15:48 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java Wed Jan 25 21:18:13 2017 +0900 @@ -96,7 +96,7 @@ } @Override - public Either moveChild(NodePath path,int childNum, String move) { + public Either moveChild(NodePath path, int childNum, String move) { MoveChild movechild = new MoveChild(move, childNum); return _edit(path,movechild); } diff -r c8a9bc5243a9 -r 0d11fd054893 src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java Wed Jan 25 06:15:48 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java Wed Jan 25 21:18:13 2017 +0900 @@ -63,7 +63,7 @@ return treeEditor; } - private Either _edit(final NodePath _path,NodeEditor _e) + private Either _edit(final NodePath _path, NodeEditor _e) { Either editEither = editor.edit(root, _path, _e); if(editEither.isA()){ @@ -119,7 +119,7 @@ } @Override - public Either putAttribute(NodePath _path,String _key,ByteBuffer _value) + public Either putAttribute(NodePath _path, String _key, ByteBuffer _value) { PutAttribute putAttribute = new PutAttribute(_key,_value); return _edit(_path,putAttribute); @@ -139,7 +139,7 @@ } @Override - public Either edit(NodePath _path,NodeEditor _editor) + public Either edit(NodePath _path, NodeEditor _editor) { return _edit(_path,_editor); }