=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CombinationGenerator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CombinationGenerator.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CombinationGenerator.java 2014-09-28 17:12:48 +0000 @@ -40,7 +40,8 @@ private int[] indexes; // Current index for each array private int no; // No of arrays - public CombinationGenerator( T[]... objects ) + @SafeVarargs + public CombinationGenerator( final T[]... objects ) { this.objects = objects; this.indexes = new int[objects.length]; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java 2014-09-25 15:46:23 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java 2014-09-28 17:12:48 +0000 @@ -147,7 +147,8 @@ * @param elements the elements to put on the map. * @return a map. */ - public static Map asMap( T... elements ) + @SafeVarargs + public static final Map asMap( final T... elements ) { Map map = new HashMap<>(); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MapMap.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MapMap.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MapMap.java 2014-09-28 17:12:48 +0000 @@ -58,8 +58,9 @@ { return this.get( key ) == null ? null : this.get( key ).get( valueKey ); } - - public static MapMap asMapMap( AbstractMap.SimpleEntry>... entries ) + + @SafeVarargs + public static final MapMap asMapMap( final AbstractMap.SimpleEntry>... entries ) { MapMap map = new MapMap<>(); === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/collection/SetBuilder.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/collection/SetBuilder.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/collection/SetBuilder.java 2014-09-28 17:12:48 +0000 @@ -50,7 +50,8 @@ return this; } - public SetBuilder add( E... elements ) + @SafeVarargs + public final SetBuilder add( final E... elements ) { for ( E element : elements ) { === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CollectionUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CollectionUtils.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CollectionUtils.java 2014-09-28 17:12:48 +0000 @@ -86,8 +86,9 @@ { return collection != null ? collection : new HashSet(); } - - public static Set asSet( T... items ) + + @SafeVarargs + public static final Set asSet( final T... items ) { Set set = new HashSet<>(); @@ -117,7 +118,8 @@ * @param entries any number of (key, value) pairs * @return Map of the entries */ - public static Map asMap( AbstractMap.SimpleEntry... entries ) + @SafeVarargs + public static final Map asMap( final AbstractMap.SimpleEntry... entries ) { Map map = new HashMap<>(); === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ConversionUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ConversionUtils.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ConversionUtils.java 2014-09-28 17:12:48 +0000 @@ -228,9 +228,10 @@ * @param objects the array of objects. * @return a List of objects. */ - public static List getList( T... objects ) + @SafeVarargs + public static final List getList( final T... objects ) { - List list = new ArrayList<>(); + final List list = new ArrayList<>(); for ( T object : objects ) { === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.java 2014-09-25 12:50:57 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.java 2014-09-28 17:12:48 +0000 @@ -177,7 +177,8 @@ * @param items the items which should be included in the Collection. * @return a Collection. */ - public static Collection getCollection( T... items ) + @SafeVarargs + public static final Collection getCollection( final T... items ) { List list = new ArrayList<>(); @@ -195,7 +196,8 @@ * @param items the items which should be included in the List. * @return a List. */ - public static List getList( T... items ) + @SafeVarargs + public static final List getList( final T... items ) { List list = new ArrayList<>(); @@ -255,7 +257,7 @@ * @return a union of the given lists. */ @SafeVarargs - public static List union( final List... lists ) + public static final List union( final List... lists ) { final List union = new ArrayList<>(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2014-09-26 10:43:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2014-09-28 17:12:48 +0000 @@ -29,7 +29,6 @@ */ import java.util.ArrayList; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -38,9 +37,9 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; +import org.hisp.dhis.system.util.AttributeUtils; import com.opensymphony.xwork2.Action; -import org.hisp.dhis.system.util.AttributeUtils; /** * @author Lars Helge Overland