dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #38001
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19413: Removed now unnecessary list wrappers
------------------------------------------------------------
revno: 19413
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-06-16 10:40:38 +0200
message:
Removed now unnecessary list wrappers
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/GetCategoryOptionGroupSetListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.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-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2015-06-16 08:40:38 +0000
@@ -309,7 +309,7 @@
@Override
public PeriodType getPeriodType( DataElement dataElement, Collection<Integer> dataSetIdentifiers )
{
- Collection<DataSet> dataSets = getDataSets( dataSetIdentifiers );
+ List<DataSet> dataSets = getDataSets( dataSetIdentifiers );
for ( DataSet dataSet : dataSets )
{
@@ -343,7 +343,7 @@
@Override
public Set<DataElement> getDistinctDataElements( Collection<Integer> dataSetIdentifiers )
{
- Collection<DataSet> dataSets = getDataSets( dataSetIdentifiers );
+ List<DataSet> dataSets = getDataSets( dataSetIdentifiers );
Set<DataElement> dataElements = new HashSet<>();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java 2015-06-16 08:40:38 +0000
@@ -28,7 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
import java.util.List;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -81,8 +80,7 @@
defaultCategoryOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
this.paging = createPaging( categoryService.getOptionComboCount() );
- optionCombos = new ArrayList<>( categoryService.getOptionCombosBetween( paging.getStartPos(),
- paging.getPageSize() ) );
+ optionCombos = categoryService.getOptionCombosBetween( paging.getStartPos(), paging.getPageSize() );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java 2015-06-16 08:40:38 +0000
@@ -28,7 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -74,8 +73,7 @@
@Override
public String execute()
{
- dataElementCategories = new ArrayList<>( dataElementCategoryService
- .getAllDataElementCategories() );
+ dataElementCategories = dataElementCategoryService.getAllDataElementCategories();
Collections.sort( dataElementCategories, IdentifiableObjectNameComparator.INSTANCE );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/GetCategoryOptionGroupSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/GetCategoryOptionGroupSetListAction.java 2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/GetCategoryOptionGroupSetListAction.java 2015-06-16 08:40:38 +0000
@@ -30,7 +30,6 @@
import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -72,7 +71,7 @@
this.key = key;
}
- private List<CategoryOptionGroupSet> categoryOptionGroupSets = new ArrayList<>();
+ private List<CategoryOptionGroupSet> categoryOptionGroupSets;
public List<CategoryOptionGroupSet> getCategoryOptionGroupSets()
{
@@ -91,17 +90,15 @@
{
this.paging = createPaging( dataElementCategoryService.getCategoryOptionGroupSetCountByName( key ) );
- categoryOptionGroupSets = new ArrayList<>(
- dataElementCategoryService.getCategoryOptionGroupSetsBetweenByName( paging.getStartPos(),
- paging.getPageSize(), key ) );
+ categoryOptionGroupSets = dataElementCategoryService.getCategoryOptionGroupSetsBetweenByName( paging.getStartPos(),
+ paging.getPageSize(), key );
}
else
{
this.paging = createPaging( dataElementCategoryService.getCategoryOptionGroupSetCount() );
- categoryOptionGroupSets = new ArrayList<>(
- dataElementCategoryService.getCategoryOptionGroupSetsBetween( paging.getStartPos(),
- paging.getPageSize() ) );
+ categoryOptionGroupSets = dataElementCategoryService.getCategoryOptionGroupSetsBetween( paging.getStartPos(),
+ paging.getPageSize() );
}
Collections.sort( categoryOptionGroupSets, IdentifiableObjectNameComparator.INSTANCE );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java 2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java 2015-06-16 08:40:38 +0000
@@ -30,7 +30,6 @@
import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -94,13 +93,13 @@
{
this.paging = createPaging( indicatorService.getIndicatorCountByName( key ) );
- indicators = new ArrayList<>( indicatorService.getIndicatorsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+ indicators = indicatorService.getIndicatorsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
}
else
{
this.paging = createPaging( indicatorService.getIndicatorCount() );
- indicators = new ArrayList<>( indicatorService.getIndicatorsBetween( paging.getStartPos(), paging.getPageSize() ) );
+ indicators = indicatorService.getIndicatorsBetween( paging.getStartPos(), paging.getPageSize() );
}
Collections.sort( indicators, new IdentifiableObjectNameComparator() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java 2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java 2015-06-16 08:40:38 +0000
@@ -30,7 +30,6 @@
import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -91,13 +90,13 @@
{
this.paging = createPaging( indicatorService.getIndicatorGroupCountByName( key ) );
- indicatorGroups = new ArrayList<>( indicatorService.getIndicatorGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+ indicatorGroups = indicatorService.getIndicatorGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
}
else
{
this.paging = createPaging( indicatorService.getIndicatorGroupCount() );
- indicatorGroups = new ArrayList<>( indicatorService.getIndicatorGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
+ indicatorGroups = indicatorService.getIndicatorGroupsBetween( paging.getStartPos(), paging.getPageSize() );
}
Collections.sort( indicatorGroups, IdentifiableObjectNameComparator.INSTANCE );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java 2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java 2015-06-16 08:40:38 +0000
@@ -30,7 +30,6 @@
import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -93,13 +92,13 @@
{
this.paging = createPaging( indicatorService.getIndicatorGroupSetCountByName( key ) );
- indicatorGroupSets = new ArrayList<>( indicatorService.getIndicatorGroupSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+ indicatorGroupSets = indicatorService.getIndicatorGroupSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
}
else
{
this.paging = createPaging( indicatorService.getIndicatorGroupSetCount() );
- indicatorGroupSets = new ArrayList<>( indicatorService.getIndicatorGroupSetsBetween( paging.getStartPos(), paging.getPageSize() ) );
+ indicatorGroupSets = indicatorService.getIndicatorGroupSetsBetween( paging.getStartPos(), paging.getPageSize() );
}
Collections.sort( indicatorGroupSets, IdentifiableObjectNameComparator.INSTANCE );
