--- a/src/main/java/alice/jungle/persistent/PersistentChangeSet.java	Fri Oct 17 15:16:56 2014 +0900
+++ b/src/main/java/alice/jungle/persistent/PersistentChangeSet.java	Thu Jan 15 09:23:23 2015 +0900
@@ -1,77 +1,78 @@
 package alice.jungle.persistent;
 
-import fj.data.List;
 import fj.data.TreeMap;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair;
+import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.Index;
+import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.ParentIndex;
+
+public class PersistentChangeSet implements ChangeSet {
+  private final TreeNode root;
+  private final ChangeSet previous;
+  private final ChangeList changeList;
+  private final String uuid;
+  private final long revision;
+  private final String treeName;
+  private final TreeMap<String, TreeMap<String, TreeMap<TreeNode, TreeNode>>> indexList;
+  private final TreeMap<TreeNode, TreeNode> parentIndex;
 
-public class PersistentChangeSet implements ChangeSet 
-{
-	private final TreeNode root;
-	private final ChangeSet previous;
-	private final ChangeList changeList;
-	private final String uuid;
-	private final long revision;
-	private final String treeName;
-	
-	public PersistentChangeSet(TreeNode _node,ChangeSet _prev,ChangeList _log,String _uuid, String _treeName, long _revision)
-	{
-		root = _node;
-		previous = _prev;
-		changeList = _log;
-		uuid = _uuid;
-		revision = _revision;
-		treeName = _treeName;
-	}
-	
-	@Override
-	public TreeNode getRoot()
-	{
-		return root;
-	}
+  public PersistentChangeSet(TreeNode _node, ChangeSet _prev, ChangeList _log, String _uuid, String _treeName,
+      long _revision, TreeMap<String, TreeMap<String, TreeMap<TreeNode, TreeNode>>> indexList,
+      TreeMap<TreeNode, TreeNode> parentIndex) {
+    root = _node;
+    previous = _prev;
+    changeList = _log;
+    uuid = _uuid;
+    revision = _revision;
+    treeName = _treeName;
+    this.indexList = indexList;
+    this.parentIndex = parentIndex;
+  }
 
-	@Override
-	public ChangeSet prev()
-	{
-		return previous;
-	}
+  @Override
+  public TreeNode getRoot() {
+    return root;
+  }
 
-	@Override
-	public ChangeList getChangeList()
-	{
-		return changeList;
-	}
+  @Override
+  public ChangeSet prev() {
+    return previous;
+  }
 
-	@Override
-	public String uuid()
-	{
-		return uuid;
-	}
+  @Override
+  public ChangeList getChangeList() {
+    return changeList;
+  }
+
+  @Override
+  public String uuid() {
+    return uuid;
+  }
 
-	@Override
-	public long revision()
-	{
-		return revision;
-	}
+  @Override
+  public long revision() {
+    return revision;
+  }
+
+  @Override
+  public Iterable<TreeOperation> getOperations() {
+    return changeList;
+  }
 
-	@Override
-	public Iterable<TreeOperation> getOperations()
-	{
-		return changeList;
-	}
-	
-	public String getTreeName() {
-		return treeName;
-	}
+  public String getTreeName() {
+    return treeName;
+  }
 
-	@Override
-	public TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> getIndex() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+  @Override
+  public Index getIndex() {
+    return new Index(indexList);
+  }
+
+  @Override
+  public ParentIndex getParentIndex() {
+    return new ParentIndex(parentIndex);
+  }
 
 }