------------------------------------------------------------ revno: 19428 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Tue 2015-06-16 20:35:12 +0200 message: Collection to List modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.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/chart/ChartService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2015-06-16 10:36:25 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2015-06-16 18:35:12 +0000 @@ -102,7 +102,7 @@ Chart getChartByName( String name ); - Collection<Chart> getCharts( final Collection<Integer> identifiers ); + List<Chart> getCharts( final Collection<Integer> identifiers ); List<Chart> getChartsBetween( int first, int max ); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-06-16 10:36:25 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-06-16 18:35:12 +0000 @@ -178,7 +178,7 @@ * @param identifiers the Collection of identifiers. * @return a Collection of Reports. */ - Collection<Report> getReports( final Collection<Integer> identifiers ); + List<Report> getReports( final Collection<Integer> identifiers ); /** * Retrieves Reports with the given uids. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-06-16 18:35:12 +0000 @@ -111,7 +111,7 @@ * @param reportTables the identifiers of the ReportTables to retrieve. * @return a Collection of ReportTables. */ - Collection<ReportTable> getReportTables( Collection<Integer> reportTables ); + List<ReportTable> getReportTables( Collection<Integer> reportTables ); /** * Retrieves ReportTables with the given uids. === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2015-06-16 10:36:25 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2015-06-16 18:35:12 +0000 @@ -969,7 +969,7 @@ } @Override - public Collection<Chart> getCharts( final Collection<Integer> identifiers ) + public List<Chart> getCharts( final Collection<Integer> identifiers ) { List<Chart> charts = getAllCharts(); === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2015-06-16 18:35:12 +0000 @@ -74,7 +74,6 @@ /** * @author Lars Helge Overland - * @version $Id$ */ @Transactional public class DefaultReportService @@ -351,9 +350,9 @@ } @Override - public Collection<Report> getReports( final Collection<Integer> identifiers ) + public List<Report> getReports( final Collection<Integer> identifiers ) { - Collection<Report> reports = getAllReports(); + List<Report> reports = getAllReports(); return identifiers == null ? reports : FilterUtils.filter( reports, new Filter<Report>() { === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2015-06-16 18:35:12 +0000 @@ -187,9 +187,9 @@ } @Override - public Collection<ReportTable> getReportTables( final Collection<Integer> identifiers ) + public List<ReportTable> getReportTables( final Collection<Integer> identifiers ) { - Collection<ReportTable> objects = getAllReportTables(); + List<ReportTable> objects = getAllReportTables(); return identifiers == null ? objects : FilterUtils.filter( objects, new Filter<ReportTable>() {
_______________________________________________ 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