------------------------------------------------------------
revno: 19559
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2015-07-07 10:19:09 +0200
message:
Org unit service, renamed methods that retrieves UIDs
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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 2015-07-07 05:22:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2015-07-07 08:19:09 +0000
@@ -251,7 +251,14 @@
*/
List<OrganisationUnit> getOrganisationUnits( Collection<OrganisationUnitGroup> groups, Collection<OrganisationUnit> parents );
- Set<String> getOrganisationUnits( Set<String> parents, OrganisationUnitSelectionMode ouMode );
+ /**
+ * Returns organisation unit UIDs for the given parameters.
+ *
+ * @param parents the set of boundary parent organisation units.
+ * @param ouMode the organisation unit selection mode.
+ * @return a set of strings.
+ */
+ Set<String> getOrganisationUnitUids( Set<String> parents, OrganisationUnitSelectionMode ouMode );
/**
* Returns an OrganisationUnit and all its children.
=== 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 2015-07-07 05:26:40 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2015-07-07 08:19:09 +0000
@@ -322,7 +322,7 @@
}
@Override
- public Set<String> getOrganisationUnits( Set<String> parents, OrganisationUnitSelectionMode ouMode )
+ public Set<String> getOrganisationUnitUids( Set<String> parents, OrganisationUnitSelectionMode ouMode )
{
List<OrganisationUnit> ouParents = new ArrayList<>( organisationUnitStore.getByUid( parents ) );
Set<String> ou = new HashSet<>();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
