diff src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java @ 105:78ef456c98a0

add Query Status but has error
author one
date Fri, 12 Sep 2014 19:47:25 +0900
parents f9a0e7069811
children 3e75124550e9
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java	Fri Sep 12 16:22:22 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java	Fri Sep 12 19:47:25 2014 +0900
@@ -19,11 +19,11 @@
 	InterfaceTraverser traverser;
 
 	TreeNode node;
-	TreeMap<String,List<TreeNode>> index;
+	TreeMap<String,TreeMap<String, List<TreeNode>>> index;
 	JungleTreeEditor editor;
 
 	public InterfaceTraverser(TreeNode _root,
-			TreeMap<String,List<TreeNode>> index,
+	        TreeMap<String,TreeMap<String, List<TreeNode>>> index,
 			JungleTreeEditor editor) {
 		this.node = _root;
 		this.index = index;
@@ -31,8 +31,7 @@
 	}
 
 	public InterfaceTraverser getTraverser(JungleTree tree) {
-		return new InterfaceTraverser(tree.getRootNode(), tree.getIndex(),
-				tree.getTreeEditor());
+		return new InterfaceTraverser(tree.getRootNode(), tree.getIndex(), tree.getTreeEditor());
 	}
 
 	public void set(TreeNode root){
@@ -75,8 +74,8 @@
 	}
 
 	public Iterator<Pair<TreeNode, NodePath>> find(final SearchQuery query) {
-		final PathNodeIterator itNode = new PathNodeIterator(node);
-
+		final PathNodeIterator itNode = new PathNodeIterator(node, query);
+		
 		return new Iterator<Pair<TreeNode, NodePath>>() {
 
 			private Pair<TreeNode, NodePath> matchPair = nextmatch(itNode);