dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19363
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-06-11 14:24:58 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.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-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.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/dataelement/GetDataElementListAction.java	2015-06-11 12:24:58 +0000
@@ -31,7 +31,6 @@
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.hisp.dhis.user.UserSettingService.KEY_CURRENT_DOMAIN_TYPE;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -106,7 +105,7 @@
     }
 
     // -------------------------------------------------------------------------
-    // Action implemantation
+    // Action implementation
     // -------------------------------------------------------------------------
 
     @Override
@@ -135,7 +134,7 @@
         {
             this.paging = createPaging( dataElementService.getDataElementCountByName( key ) );
 
-            dataElements = new ArrayList<>( dataElementService.getDataElementsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            dataElements = dataElementService.getDataElementsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else if ( domainType != null )
         {
@@ -143,13 +142,13 @@
             
             this.paging = createPaging( dataElementService.getDataElementCountByDomainType( deDomainType ) );
 
-            dataElements = new ArrayList<>( dataElementService.getDataElementsByDomainType( deDomainType, paging.getStartPos(), paging.getPageSize() ) );
+            dataElements = dataElementService.getDataElementsByDomainType( deDomainType, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( dataElementService.getDataElementCount() );
 
-            dataElements = new ArrayList<>( dataElementService.getDataElementsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            dataElements = dataElementService.getDataElementsBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         Collections.sort( dataElements, new IdentifiableObjectNameComparator() );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupListAction.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/dataelementgroup/GetDataElementGroupListAction.java	2015-06-11 12:24:58 +0000
@@ -28,15 +28,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.ArrayList;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
 import java.util.List;
 
 import org.hisp.dhis.dataelement.DataElementGroup;
 import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.paging.ActionPagingSupport;
 
-import static org.apache.commons.lang3.StringUtils.*;
-
 /**
  * @author Torgeir Lorange Ostby
  * @version $Id: GetDataElementGroupListAction.java 2869 2007-02-20 14:26:09Z andegje $
@@ -93,13 +92,13 @@
         {
             this.paging = createPaging( dataElementService.getDataElementGroupCountByName( key ) );
 
-            dataElementGroups = new ArrayList<>( dataElementService.getDataElementGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            dataElementGroups = dataElementService.getDataElementGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( dataElementService.getDataElementGroupCount() );
 
-            dataElementGroups = new ArrayList<>( dataElementService.getDataElementGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            dataElementGroups = dataElementService.getDataElementGroupsBetween( 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/dataelementgroupset/ListDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.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/dataelementgroupset/ListDataElementGroupSetAction.java	2015-06-11 12:24:58 +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;
 
@@ -92,13 +91,13 @@
         {
             this.paging = createPaging( dataElementService.getDataElementGroupSetCountByName( key ) );
             
-            dataElementGroupSets = new ArrayList<>( dataElementService.getDataElementGroupSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            dataElementGroupSets = dataElementService.getDataElementGroupSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( dataElementService.getDataElementGroupSetCount() );
             
-            dataElementGroupSets = new ArrayList<>( dataElementService.getDataElementGroupSetsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            dataElementGroupSets = dataElementService.getDataElementGroupSetsBetween( paging.getStartPos(), paging.getPageSize() );
         }
         
         Collections.sort( dataElementGroupSets, IdentifiableObjectNameComparator.INSTANCE );