=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2014-04-29 09:26:28 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2014-09-28 19:17:21 +0000 @@ -40,7 +40,6 @@ * Defines methods for working with OrganisationUnits. * * @author Torgeir Lorange Ostby - * @version $Id: OrganisationUnitService.java 5951 2008-10-16 17:41:34Z larshelg $ */ public interface OrganisationUnitService { @@ -217,15 +216,6 @@ int getLevelOfOrganisationUnit( int id ); /** - * Returns all OrganisationUnits which are part of the subtree of the - * OrganisationUnit with the given identifier and have no children. - * - * @param id the identifier of the parent OrganisationUnit. - * @return a collection of OrganisationUnits. - */ - Collection getLeafOrganisationUnits( int id ); - - /** * Returns the intersection of the members of the given OrganisationUnitGroups * and the OrganisationUnits which are children of the given collection of * parents in the hierarchy. If the given parent collection is null or empty, === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2014-09-08 13:02:43 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2014-09-28 19:17:21 +0000 @@ -259,19 +259,6 @@ return getOrganisationUnit( id ).getOrganisationUnitLevel(); } - public Collection getLeafOrganisationUnits( int id ) - { - Collection units = getOrganisationUnitWithChildren( id ); - - return FilterUtils.filter( units, new Filter() - { - public boolean retain( OrganisationUnit object ) - { - return object != null && object.getChildren().isEmpty(); - } - } ); - } - public Collection getOrganisationUnits( Collection groups, Collection parents ) { Set members = new HashSet<>();