=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2011-03-01 22:01:40 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2011-03-01 22:27:33 +0000 @@ -39,6 +39,7 @@ import org.amplecode.quick.BatchHandler; import org.amplecode.quick.BatchHandlerFactory; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.completeness.DataSetCompletenessResult; @@ -323,19 +324,8 @@ protected int getSourcesAssociatedWithDataSet( DataSet dataSet, Collection sources ) { - int count = 0; - Collection dataSetSources = getIdentifiers( OrganisationUnit.class, dataSet.getSources() ); - - for ( Integer source : sources ) - { - if ( dataSetSources.contains( source ) ) // TODO simplify? - { - count++; - } - } - - return count; + return CollectionUtils.intersection( dataSetSources, sources ).size(); } private Date getDeadline( Period period, int days )