=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2011-03-31 16:28:24 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2011-04-06 14:47:13 +0000 @@ -28,6 +28,8 @@ */ import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashSet; import java.util.List; @@ -36,6 +38,7 @@ import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; +import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator; import org.hisp.dhis.source.Source; import org.hisp.dhis.user.User; @@ -51,6 +54,7 @@ public static final String FEATURETYPE_POLYGON = "Polygon"; public static final String FEATURETYPE_POINT = "Point"; + private static final Comparator COMPARATOR = new OrganisationUnitNameComparator(); private static final Pattern JSON_COORDINATE_PATTERN = Pattern.compile( "(\\[{3}.*?\\]{3})" ); private static final Pattern COORDINATE_PATTERN = Pattern.compile("([\\-0-9.]+,[\\-0-9.]+)"); @@ -159,6 +163,13 @@ // Logic // ------------------------------------------------------------------------- + public List getSortedChildren() + { + List sortedChildren = new ArrayList( children ); + Collections.sort( sortedChildren, COMPARATOR ); + return sortedChildren; + } + public Set getGrandChildren() { Set grandChildren = new HashSet();