# HG changeset patch
# User one
# Date 1416950620 -32400
# Node ID 8e531233d37662cc3ec6c167fb3538fa6f0a243a
# Parent  5e8eac03fed3cc9f73d1a51425e0cc4a1566bb93
commit

diff -r 5e8eac03fed3 -r 8e531233d376 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java
--- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java	Tue Nov 25 17:51:35 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java	Wed Nov 26 06:23:40 2014 +0900
@@ -21,32 +21,32 @@
   JungleTree organizationTree;
   JungleTree roleTree;
   JungleTree rdeTree;
-  boolean indexFlag;
+  boolean useIndex;
 
-  public JuGrix(boolean indexFlag) {
+  public JuGrix(boolean useIndex) {
 
     try {
-      this.indexFlag = indexFlag;
+      this.useIndex = useIndex;
       LoadXml reader = new LoadXml();
       personTree = reader.loadTestData("Person.xml");
       organizationTree = reader.loadTestData("Organization.xml");
       roleTree = reader.loadTestData("Role.xml");
       rdeTree = reader.loadTestData("RoleDescriptionElement.xml");
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
 
-      if (indexFlag) {
-        InterfaceTraverser traverser = personTree.getTraverser(indexFlag);
-        Iterator<TreeNode> emptyIterator = traverser.emptyQuery();
-        emptyIterator.hasNext();
-        traverser = organizationTree.getTraverser(indexFlag);
-        emptyIterator = traverser.emptyQuery();
-        emptyIterator.hasNext();
-        traverser = roleTree.getTraverser(indexFlag);
-        emptyIterator = traverser.emptyQuery();
-        emptyIterator.hasNext();
-        traverser = rdeTree.getTraverser(indexFlag);
-        emptyIterator = traverser.emptyQuery();
-        emptyIterator.hasNext();
-      }
+  public JuGrix(boolean useIndex, JungleTree personTree, JungleTree organizationTree, JungleTree roleTree) {
+
+    try {
+      this.useIndex = useIndex;
+      LoadXml reader = new LoadXml();
+      this.personTree = personTree;
+      this.organizationTree = organizationTree;
+      this.roleTree = roleTree;
+      rdeTree = reader.loadTestData("RoleDescriptionElement.xml");
+
     } catch (Exception e) {
       e.printStackTrace();
     }
@@ -54,7 +54,7 @@
 
   public boolean isActive(String id) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
+    InterfaceTraverser personTraverser = personTree.getTraverser(useIndex);
     Iterator<TreeNode> personIdpairIterator = personTraverser.find((TreeNode node) -> {
       String personId = node.getAttributes().getString("Person-id");
       if (personId == null)
@@ -72,7 +72,7 @@
 
   public Iterator<String> personIds(String orgId, LinkedList<String> filterIds) {
 
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(useIndex);
 
     Iterator<TreeNode> orgIdNodeIterator = orgTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
@@ -98,7 +98,7 @@
     if (!filter(filterIds, orgRoleId))
       return new NullIterator<String>();
 
-    InterfaceTraverser traverser = personTree.getTraverser(indexFlag);
+    InterfaceTraverser traverser = personTree.getTraverser(useIndex);
 
     return new Iterator<String>() {
       Iterator<TreeNode> orgIdNodeIterator = traverser.find((TreeNode node) -> {
@@ -157,7 +157,7 @@
 
   public Iterator<String> searchPersonRoleIds(JungleTree tree, String id, String element, LinkedList<String> filterIds) {
 
-    InterfaceTraverser traverser = tree.getTraverser(indexFlag);
+    InterfaceTraverser traverser = tree.getTraverser(useIndex);
 
     return new Iterator<String>() {
 
@@ -237,7 +237,7 @@
 
   public Iterator<String> searchOrgRoleIds(JungleTree tree, String id, String element, LinkedList<String> filterIds) {
 
-    InterfaceTraverser traverser = tree.getTraverser(indexFlag);
+    InterfaceTraverser traverser = tree.getTraverser(useIndex);
 
     return new Iterator<String>() {
 
@@ -314,7 +314,7 @@
 
   public Iterator<String> competentRoleId(String personId) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
+    InterfaceTraverser personTraverser = personTree.getTraverser(useIndex);
 
     return new Iterator<String>() {
 
@@ -375,7 +375,7 @@
 
   public Iterator<String> concurrentRoleIds(String personId) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
+    InterfaceTraverser personTraverser = personTree.getTraverser(useIndex);
 
     return new Iterator<String>() {
 
@@ -580,7 +580,7 @@
 
   public Iterator<TreeNode> childOrganizationIdsNode(String orgId) {
 
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(useIndex);
 
     return new Iterator<TreeNode>() {
       TreeNode childOrgNode;
@@ -687,7 +687,7 @@
   }
 
   private String getRole(String orgId) {
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(useIndex);
     Iterator<TreeNode> orgNodeIterator = orgTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
       if (nodeElement == null)
@@ -714,7 +714,7 @@
 
   private boolean getRde(String roleId, String filterId) {
 
-    InterfaceTraverser roleTraverser = roleTree.getTraverser(indexFlag);
+    InterfaceTraverser roleTraverser = roleTree.getTraverser(useIndex);
     Iterator<TreeNode> rdeIdNodeIterator = roleTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
       if (nodeElement == null)
@@ -745,7 +745,7 @@
 
   public TreeMap<String, String> _childOrganizationIds(String orgId, TreeMap<String, String> childOrgIdsTreeMap) {
 
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(useIndex);
 
     Iterator<TreeNode> orgIdNodeIterator = orgTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
@@ -817,7 +817,7 @@
 
   public String rolePriority(String personId, String roleId) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
+    InterfaceTraverser personTraverser = personTree.getTraverser(useIndex);
 
     Iterator<TreeNode> roleIdNodeIterator = personTraverser.find((TreeNode node) -> {
       String element = node.getAttributes().getString("element");
@@ -953,7 +953,7 @@
         if (roleMacher.find()) {
           element = "Person";
           pos = 5;
-          return personTree.getTraverser(indexFlag);
+          return personTree.getTraverser(useIndex);
         }
 
         Pattern rdePattern = Pattern.compile("o:");
@@ -961,7 +961,7 @@
         if (rdeMacher.find()) {
           element = "Organization";
           pos = 4;
-          return organizationTree.getTraverser(indexFlag);
+          return organizationTree.getTraverser(useIndex);
         }
         return null;
       }
@@ -1047,11 +1047,11 @@
     InterfaceTraverser traverser = null;
     String elementName = null;
     if (splitPath[0].equals("r")) {
-      traverser = roleTree.getTraverser(indexFlag);
+      traverser = roleTree.getTraverser(useIndex);
       elementName = "Role";
     }
     if (splitPath[0].equals("rde")) {
-      traverser = rdeTree.getTraverser(indexFlag);
+      traverser = rdeTree.getTraverser(useIndex);
       elementName = "RoleDescriptionElement";
     }
 
@@ -1111,7 +1111,7 @@
 
   private Iterator<String> getRde(String roleId) {
 
-    InterfaceTraverser traverser = roleTree.getTraverser(indexFlag);
+    InterfaceTraverser traverser = roleTree.getTraverser(useIndex);
 
     return new Iterator<String>() {