Simplify hierarchy units

[lgpl/argeo-commons.git] / org.argeo.util / src / org / argeo / osgi / useradmin / HierarchyUnit.java

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/HierarchyUnit.java b/org.argeo.util/src/org/argeo/osgi/useradmin/HierarchyUnit.java
index 24943463139baa20772c928bdef48acccac0aa24..9783a2786b238819330d8a2da050c81f36297c3a 100644 (file)
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/HierarchyUnit.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/HierarchyUnit.java
@@ -1,7 +1,6 @@
 package org.argeo.osgi.useradmin;
 
 import java.util.List;
-import java.util.Map;
 
 import org.osgi.service.useradmin.Role;
 
@@ -13,17 +12,17 @@ public interface HierarchyUnit {
 
        String getHierarchyUnitName();
 
-       int getHierarchyChildCount();
-
        HierarchyUnit getParent();
 
-       HierarchyUnit getHierarchyChild(int i);
+       Iterable<HierarchyUnit> getDirectHierachyUnits();
 
        int getHierarchyUnitType();
 
        String getBasePath();
 
-       List<? extends Role> getRoles(String filter, boolean deep);
-       
+       List<? extends Role> getHierarchyUnitRoles(String filter, boolean deep);
+
+       UserDirectory getDirectory();
+
 //     Map<String,Object> getHierarchyProperties();
 }