=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserGroupComparator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserGroupComparator.java 2014-10-16 06:17:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserGroupComparator.java 1970-01-01 00:00:00 +0000 @@ -1,56 +0,0 @@ -package org.hisp.dhis.user.comparator; - -/* - * Copyright (c) 2004-2014, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Comparator; - -import org.hisp.dhis.user.UserGroup; - -/** - * @author mortenoh - */ -public class UserGroupComparator - implements Comparator -{ - @Override - public int compare( UserGroup ug0, UserGroup ug1 ) - { - if ( ug0 == null ) - { - return 1; - } - - if ( ug1 == null ) - { - return -1; - } - - return ug0.getName().compareTo( ug1.getName() ); - } -} === removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserRoleComparator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserRoleComparator.java 2014-10-16 06:17:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserRoleComparator.java 1970-01-01 00:00:00 +0000 @@ -1,56 +0,0 @@ -package org.hisp.dhis.user.comparator; - -/* - * Copyright (c) 2004-2014, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Comparator; - -import org.hisp.dhis.user.UserAuthorityGroup; - -/** - * @author mortenoh - */ -public class UserRoleComparator - implements Comparator -{ - @Override - public int compare( UserAuthorityGroup ur0, UserAuthorityGroup ur1 ) - { - if ( ur0 == null ) - { - return 1; - } - - if ( ur1 == null ) - { - return -1; - } - - return ur0.getName().compareTo( ur1.getName() ); - } -} === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserGroupsAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserGroupsAction.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserGroupsAction.java 2015-01-02 19:59:04 +0000 @@ -32,11 +32,10 @@ import java.util.Collections; import java.util.List; +import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.paging.ActionPagingSupport; -import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupService; -import org.hisp.dhis.user.comparator.UserGroupComparator; /* * @author mortenoh @@ -88,7 +87,7 @@ userGroups = IdentifiableObjectUtils.filterNameByKey( userGroups, key, true ); } - Collections.sort( userGroups, new UserGroupComparator() ); + Collections.sort( userGroups ); if ( usePaging ) { === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java 2014-10-16 06:17:19 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java 2015-01-02 19:59:04 +0000 @@ -35,7 +35,6 @@ import org.hisp.dhis.paging.ActionPagingSupport; import org.hisp.dhis.user.UserAuthorityGroup; import org.hisp.dhis.user.UserService; -import org.hisp.dhis.user.comparator.UserRoleComparator; /** * @author mortenoh @@ -77,7 +76,7 @@ userService.canIssueFilter( userRoles ); - Collections.sort( userRoles, new UserRoleComparator() ); + Collections.sort( userRoles ); if ( usePaging ) { === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java 2014-11-26 12:22:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java 2015-01-02 19:59:04 +0000 @@ -28,28 +28,28 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.opensymphony.xwork2.Action; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; import org.hisp.dhis.configuration.Configuration; import org.hisp.dhis.configuration.ConfigurationService; +import org.hisp.dhis.dataelement.DataElementGroup; +import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.indicator.IndicatorGroup; import org.hisp.dhis.indicator.IndicatorService; -import org.hisp.dhis.dataelement.DataElementGroup; -import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.organisationunit.OrganisationUnitLevel; import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.organisationunit.comparator.OrganisationUnitLevelComparator; import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.period.PeriodType; +import org.hisp.dhis.period.RelativePeriodEnum; import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupService; -import org.hisp.dhis.user.comparator.UserGroupComparator; -import org.hisp.dhis.period.RelativePeriodEnum; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland @@ -215,7 +215,7 @@ userGroups = new ArrayList<>( userGroupService.getAllUserGroups() ); - Collections.sort( userGroups, new UserGroupComparator() ); + Collections.sort( userGroups ); organisationUnitLevels = organisationUnitService.getOrganisationUnitLevels(); === modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java' --- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java 2014-10-16 06:17:19 +0000 +++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java 2015-01-02 19:59:04 +0000 @@ -36,7 +36,6 @@ import org.hisp.dhis.sms.outbound.OutboundSmsTransportService; import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupService; -import org.hisp.dhis.user.comparator.UserGroupComparator; import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -95,7 +94,7 @@ { userGroups = new ArrayList<>( userGroupService.getAllUserGroups() ); - Collections.sort( userGroups, new UserGroupComparator() ); + Collections.sort( userGroups ); return SUCCESS; }