dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19840
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-08-25 09:52:52 +0200
message:
  Removed unused methods
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.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/dataelement/DataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2015-08-25 07:43:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2015-08-25 07:52:52 +0000
@@ -464,12 +464,8 @@
 
     DataElementGroupSet getDataElementGroupSetByName( String name );
 
-    List<DataElementGroupSet> getCompulsoryDataElementGroupSets();
-
     List<DataElementGroupSet> getCompulsoryDataElementGroupSetsWithMembers();
 
-    List<DataElementGroupSet> getCompulsoryDataElementGroupSetsNotAssignedTo( DataElement dataElement );
-
     List<DataElementGroupSet> getAllDataElementGroupSets();
 
     List<DataElementGroupSet> getDataElementGroupSets( Collection<Integer> identifiers );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2015-08-25 07:43:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2015-08-25 07:52:52 +0000
@@ -614,22 +614,6 @@
     }
 
     @Override
-    public List<DataElementGroupSet> getCompulsoryDataElementGroupSets()
-    {
-        List<DataElementGroupSet> groupSets = new ArrayList<>();
-
-        for ( DataElementGroupSet groupSet : getAllDataElementGroupSets() )
-        {
-            if ( groupSet.isCompulsory() )
-            {
-                groupSets.add( groupSet );
-            }
-        }
-
-        return groupSets;
-    }
-
-    @Override
     public List<DataElementGroupSet> getCompulsoryDataElementGroupSetsWithMembers()
     {
         return FilterUtils.filter( getAllDataElementGroupSets(), new Filter<DataElementGroupSet>()
@@ -643,22 +627,6 @@
     }
 
     @Override
-    public List<DataElementGroupSet> getCompulsoryDataElementGroupSetsNotAssignedTo( DataElement dataElement )
-    {
-        List<DataElementGroupSet> groupSets = new ArrayList<>();
-
-        for ( DataElementGroupSet groupSet : getCompulsoryDataElementGroupSets() )
-        {
-            if ( !groupSet.isMemberOfDataElementGroups( dataElement ) && groupSet.hasDataElementGroups() )
-            {
-                groupSets.add( groupSet );
-            }
-        }
-
-        return groupSets;
-    }
-
-    @Override
     public List<DataElementGroupSet> getAllDataElementGroupSets()
     {
         return i18n( i18nService, dataElementGroupSetStore.getAll() );