/ - Diff - Edit - Redmine

Revision 2d726275

ID	2d7262752d99677e4ff7cc573961d90a4558cd1f
Parent	820ca4ec
Child	09e88a38

Added by Andreas Müller 12 months ago

ref #1447 add ancestor id splitter to TreeIndex

+     *
      * @author a.mueller
      * @since 02.12.2016
+     *
      */
     public class TreeIndex {
         public static String sep = "#";
         //regEx, we also allow the tree itself to have a tree index (e.g. #t1#)
         //this may change in future as not necessarily needed
         private static String regEx = sep+"[a-z](\\d+"+sep+")+";
         private static Pattern pattern = Pattern.compile(regEx);
         private static TreeIndexComparator comparator = new TreeIndexComparator();
         private String treeIndex;
     //***************** FACTORY ********************************/
         public static TreeIndex NewInstance(String treeIndex){
             return new TreeIndex(treeIndex);
+        }
         /**
          * @param subtree
          * @return
          */
         public static TreeIndex NewInstance(TaxonNode node) {
             if (node == null){
                 return null;
-...
+            }
+        }
         /**
          * @param stringList
          * @return
          */
         public static List<TreeIndex> NewListInstance(List<String> stringList) {
             List<TreeIndex> result = new ArrayList<>();
             for (String string: stringList){
-...
             return result;
+        }
         //regEx, we also allow the tree itself to have a tree index (e.g. #t1#)
         //this may change in future as not necessarily needed
         private static String regEx = "#[a-z](\\d+#)+";
         private static Pattern pattern = Pattern.compile(regEx);
         private static TreeIndexComparator comparator = new TreeIndexComparator();
         private String treeIndex;
     // ******************* CONSTRUCTOR ********************/
         private TreeIndex(String treeIndex){
             if (! pattern.matcher(treeIndex).matches()){
-...
     // ************** METHODS ***************************************/
         /**
          * @param taxonTreeIndex
          * @return
          */
         public boolean hasChild(TreeIndex childCandidateTreeIndex) {
             return childCandidateTreeIndex.treeIndex.startsWith(treeIndex);
+        }
         /**
          * Returns a new TreeIndex instance which represents the parent of this tree index.
          * Returns null if this tree index already represents the root node of the tree.
          * @return
          */
         public TreeIndex parent(){
             int index = treeIndex.substring(0, treeIndex.length()-1).lastIndexOf(ITreeNode.separator);
-...
     // ********************** STATIC METHODS  *****************************/
         /**
          * Returns a list of string based tree node ids of all ancestors. Starts with the highest ancestor.
+         *
          * @param includeRoot if the root node which has no data attached should be included
          * @param includeTree if the tree node which precedes the treeindex representing the tree should be included
          */
         public List<String> parentNodeIds(boolean includeRoot, boolean includeTree){
             String[] splits = treeIndex.split(sep);
             List<String> result = new ArrayList<>();
             for (int i = 1; i<splits.length; i++){  //the first split is empty
                 if (i > 2 || i == 1 && includeTree || i == 2 && includeRoot){
                     result.add(splits[i]);
+                }
+            }
             return result;
+        }
         /**
          * Returns a list of integer based tree node ids of all ancestors. Starts with the highest ancestor.
          * @param treeIndex the tree index
          * @param includeRoot if the root node which has no data attached should be included
          */
         public List<Integer> parentNodeIds(boolean includeRoot){
             List<String> split = parentNodeIds(includeRoot, false);
             List<Integer> result = new ArrayList<>();
             for (String str:split){
                 result.add(Integer.valueOf(str));
+            }
             return result;
+        }
         /**
          * Creates a list for the given tree indexes and sorts them in ascending
          * order.
          * @param treeIndexSet
-...
             return result;
+        }
         /**
          * Creates a list for the given tree indexes and sorts them in descending
          * order.
          * @param treeIndexSet
          * @return
          */
         public static List<TreeIndex> sortDesc(Collection<TreeIndex> treeIndexSet) {
             List<TreeIndex> result = sort(treeIndexSet);
-...
             return result;
+        }
     // **************************** EQUALS *****************************/
         @Override
-...
     // *************************** toString() ***********************
         @Override
         public String toString(){
             return treeIndex;
-...
         /**
          * Null save toString method.
          * @param treeIndex
          * @return
          */
         public static String toString(TreeIndex treeIndex) {
             return treeIndex == null? null: treeIndex.toString();
+        }
         /**
          * @param treeIndexes
          * @return
          */
         public static List<String> toString(Collection<TreeIndex> treeIndexes) {
             List<String> result = new ArrayList<>();
             for (TreeIndex treeIndex : treeIndexes){
-...
+            }
             return result;
+        }
+    }

     */
     package eu.etaxonomy.cdm.model.common;
     import java.util.List;
     import org.junit.Assert;
     import org.junit.Before;
     import org.junit.Test;
-...
     /**
      * @author a.mueller
      * @since 12.09.2018
+     *
      */
     public class TreeIndexTest {
-...
             Assert.assertTrue("Index should be tree", indexTree.isTree());
+        }
         @Test
         public void testParentNodeIds() {
             TreeIndex myIndex = TreeIndex.NewInstance("#t1#222#33#444#515#");
             List<Integer> nodeIds = myIndex.parentNodeIds(false);
             Assert.assertEquals("Last index should be 515", (Integer)515, nodeIds.get(nodeIds.size()-1));
             List<String> nodeIdsStr = myIndex.parentNodeIds(true, true);
             Assert.assertEquals("1st index should be 't1'", "t1", nodeIdsStr.get(0));
             Assert.assertEquals("3rd index should be '33'", "33", nodeIdsStr.get(2));
+        }
+    }

Also available in: Unified diff

Project

General

Profile

Edit

Revision 2d726275