dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #38005
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19417: Collection to list for id object manager
------------------------------------------------------------
revno: 19417
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-06-16 12:59:33 +0200
message:
Collection to list for id object manager
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.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/category/GetDataElementCategoryListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.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/attribute/AttributeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java 2015-06-16 10:59:33 +0000
@@ -29,7 +29,6 @@
*/
import java.util.List;
-import java.util.Set;
/**
* @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-06-16 10:59:33 +0000
@@ -65,25 +65,25 @@
<T extends IdentifiableObject> T search( Class<T> clazz, String query );
- <T extends IdentifiableObject> Collection<T> filter( Class<T> clazz, String query );
-
- <T extends IdentifiableObject> Collection<T> getAll( Class<T> clazz );
-
- <T extends IdentifiableObject> Collection<T> getAllByName( Class<T> clazz, String name );
-
- <T extends IdentifiableObject> Collection<T> getAllByNameIgnoreCase( Class<T> clazz, String name );
-
- <T extends IdentifiableObject> Collection<T> getAllSorted( Class<T> clazz );
-
- <T extends IdentifiableObject> Collection<T> getAllSortedByLastUpdated( Class<T> clazz );
+ <T extends IdentifiableObject> List<T> filter( Class<T> clazz, String query );
+
+ <T extends IdentifiableObject> List<T> getAll( Class<T> clazz );
+
+ <T extends IdentifiableObject> List<T> getAllByName( Class<T> clazz, String name );
+
+ <T extends IdentifiableObject> List<T> getAllByNameIgnoreCase( Class<T> clazz, String name );
+
+ <T extends IdentifiableObject> List<T> getAllSorted( Class<T> clazz );
+
+ <T extends IdentifiableObject> List<T> getAllSortedByLastUpdated( Class<T> clazz );
<T extends IdentifiableObject> List<T> getByUid( Class<T> clazz, Collection<String> uids );
<T extends IdentifiableObject> List<T> getByUidOrdered( Class<T> clazz, List<String> uids );
- <T extends IdentifiableObject> Collection<T> getLikeName( Class<T> clazz, String name );
+ <T extends IdentifiableObject> List<T> getLikeName( Class<T> clazz, String name );
- <T extends NameableObject> Collection<T> getLikeShortName( Class<T> clazz, String shortName );
+ <T extends NameableObject> List<T> getLikeShortName( Class<T> clazz, String shortName );
<T extends IdentifiableObject> List<T> getBetween( Class<T> clazz, int first, int max );
@@ -95,11 +95,11 @@
<T extends IdentifiableObject> List<T> getByLastUpdated( Class<T> clazz, Date lastUpdated );
- <T extends IdentifiableObject> Collection<T> getByCreated( Class<T> clazz, Date created );
-
- <T extends IdentifiableObject> Collection<T> getByLastUpdatedSorted( Class<T> clazz, Date lastUpdated );
-
- <T extends IdentifiableObject> Collection<T> getByCreatedSorted( Class<T> clazz, Date created );
+ <T extends IdentifiableObject> List<T> getByCreated( Class<T> clazz, Date created );
+
+ <T extends IdentifiableObject> List<T> getByLastUpdatedSorted( Class<T> clazz, Date lastUpdated );
+
+ <T extends IdentifiableObject> List<T> getByCreatedSorted( Class<T> clazz, Date created );
<T extends IdentifiableObject> Date getLastUpdated( Class<T> clazz );
@@ -153,7 +153,7 @@
<T extends IdentifiableObject> int getCountNoAcl( Class<T> clazz );
- <T extends IdentifiableObject> Collection<T> getAllNoAcl( Class<T> clazz );
+ <T extends IdentifiableObject> List<T> getAllNoAcl( Class<T> clazz );
- <T extends IdentifiableObject> Collection<T> getBetweenNoAcl( Class<T> clazz, int first, int max );
+ <T extends IdentifiableObject> List<T> getBetweenNoAcl( Class<T> clazz, int first, int max );
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java 2015-06-16 10:59:33 +0000
@@ -28,7 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.Collection;
import java.util.List;
import org.hisp.dhis.common.GenericNameableObjectStore;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2015-06-16 10:59:33 +0000
@@ -239,7 +239,7 @@
}
@Override
- public <T extends IdentifiableObject> Collection<T> filter( Class<T> clazz, String query )
+ public <T extends IdentifiableObject> List<T> filter( Class<T> clazz, String query )
{
Set<T> uniqueObjects = new HashSet<>();
@@ -268,72 +268,72 @@
@Override
@SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getAll( Class<T> clazz )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAll();
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getAllByName( Class<T> clazz, String name )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAllEqName( name );
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getAllByNameIgnoreCase( Class<T> clazz, String name )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAllEqNameIgnoreCase( name );
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getAllSorted( Class<T> clazz )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAllOrderedName();
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getAllSortedByLastUpdated( Class<T> clazz )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAllOrderedLastUpdated();
+ public <T extends IdentifiableObject> List<T> getAll( Class<T> clazz )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAll();
+ }
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public <T extends IdentifiableObject> List<T> getAllByName( Class<T> clazz, String name )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAllEqName( name );
+ }
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public <T extends IdentifiableObject> List<T> getAllByNameIgnoreCase( Class<T> clazz, String name )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAllEqNameIgnoreCase( name );
+ }
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public <T extends IdentifiableObject> List<T> getAllSorted( Class<T> clazz )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAllOrderedName();
+ }
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public <T extends IdentifiableObject> List<T> getAllSortedByLastUpdated( Class<T> clazz )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAllOrderedLastUpdated();
}
@Override
@@ -472,7 +472,7 @@
@Override
@SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getLikeName( Class<T> clazz, String name )
+ public <T extends IdentifiableObject> List<T> getLikeName( Class<T> clazz, String name )
{
GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
@@ -481,12 +481,12 @@
return new ArrayList<>();
}
- return (Collection<T>) store.getAllLikeName( name );
+ return (List<T>) store.getAllLikeName( name );
}
@Override
@SuppressWarnings( "unchecked" )
- public <T extends NameableObject> Collection<T> getLikeShortName( Class<T> clazz, String shortName )
+ public <T extends NameableObject> List<T> getLikeShortName( Class<T> clazz, String shortName )
{
GenericNameableObjectStore<NameableObject> store = getNameableObjectStore( clazz );
@@ -495,7 +495,7 @@
return new ArrayList<>();
}
- return (Collection<T>) store.getAllLikeShortName( shortName );
+ return (List<T>) store.getAllLikeShortName( shortName );
}
@Override
@@ -570,44 +570,44 @@
@Override
@SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getByCreated( Class<T> clazz, Date created )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAllGeCreated( created );
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getByLastUpdatedSorted( Class<T> clazz, Date lastUpdated )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAllGeLastUpdatedOrderedName( lastUpdated );
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getByCreatedSorted( Class<T> clazz, Date created )
- {
- GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
-
- if ( store == null )
- {
- return new ArrayList<>();
- }
-
- return (Collection<T>) store.getAllGeCreatedOrderedName( created );
+ public <T extends IdentifiableObject> List<T> getByCreated( Class<T> clazz, Date created )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAllGeCreated( created );
+ }
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public <T extends IdentifiableObject> List<T> getByLastUpdatedSorted( Class<T> clazz, Date lastUpdated )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAllGeLastUpdatedOrderedName( lastUpdated );
+ }
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public <T extends IdentifiableObject> List<T> getByCreatedSorted( Class<T> clazz, Date created )
+ {
+ GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
+
+ if ( store == null )
+ {
+ return new ArrayList<>();
+ }
+
+ return (List<T>) store.getAllGeCreatedOrderedName( created );
}
@Override
@@ -656,7 +656,7 @@
return map;
}
- Collection<T> objects = store.getAll();
+ List<T> objects = store.getAll();
for ( T object : objects )
{
@@ -706,7 +706,7 @@
return map;
}
- Collection<T> objects = store.getAllNoAcl();
+ List<T> objects = store.getAllNoAcl();
for ( T object : objects )
{
@@ -760,7 +760,7 @@
GenericNameableObjectStore<T> store = (GenericNameableObjectStore<T>) getNameableObjectStore( clazz );
- Collection<T> objects = store.getAll();
+ List<T> objects = store.getAll();
for ( T object : objects )
{
@@ -784,7 +784,7 @@
GenericNameableObjectStore<T> store = (GenericNameableObjectStore<T>) getNameableObjectStore( clazz );
- Collection<T> objects = store.getAllNoAcl();
+ List<T> objects = store.getAllNoAcl();
for ( T object : objects )
{
@@ -926,7 +926,7 @@
@Override
@SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getAllNoAcl( Class<T> clazz )
+ public <T extends IdentifiableObject> List<T> getAllNoAcl( Class<T> clazz )
{
GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
@@ -935,12 +935,12 @@
return new ArrayList<>();
}
- return (Collection<T>) store.getAllNoAcl();
+ return (List<T>) store.getAllNoAcl();
}
@Override
@SuppressWarnings( "unchecked" )
- public <T extends IdentifiableObject> Collection<T> getBetweenNoAcl( Class<T> clazz, int first, int max )
+ public <T extends IdentifiableObject> List<T> getBetweenNoAcl( Class<T> clazz, int first, int max )
{
GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
@@ -949,7 +949,7 @@
return new ArrayList<>();
}
- return (Collection<T>) store.getAllNoAcl( first, max );
+ return (List<T>) store.getAllNoAcl( first, max );
}
@Override
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java 2015-06-16 10:59:33 +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;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java 2015-06-16 10:59:33 +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;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java 2015-06-16 10:59:33 +0000
@@ -28,18 +28,17 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+import java.util.Collections;
+import java.util.List;
+
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.option.OptionService;
import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.paging.ActionPagingSupport;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
/**
* @author Chau Thu Tran
* @version $GetOptionSetListAction.java Feb 3, 2012 9:28:11 PM$
=== 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-06-16 10:36:25 +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 10:59:33 +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;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java 2015-06-16 10:59:33 +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;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java 2015-06-16 10:59:33 +0000
@@ -28,15 +28,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+import java.util.List;
+
import org.hisp.dhis.dataelement.DataElementCategoryOption;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.paging.ActionPagingSupport;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
/**
* @author Chau Thu Tran
* @version GetDataElementCategoryOptionListAction.java 8:47:42 AM Feb 22, 2013 $
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java 2015-06-16 10:59:33 +0000
@@ -31,7 +31,6 @@
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java 2015-06-16 10:59:33 +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;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java 2015-06-16 10:59:33 +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;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java 2015-06-16 10:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java 2015-06-16 10:59:33 +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;
