=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/engine/DefaultDataSetCompletenessEngine.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/engine/DefaultDataSetCompletenessEngine.java 2013-09-30 10:39:35 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/engine/DefaultDataSetCompletenessEngine.java 2013-09-30 11:28:56 +0000 @@ -28,6 +28,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.system.notification.NotificationLevel.INFO; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Future; + import org.hisp.dhis.completeness.DataSetCompletenessEngine; import org.hisp.dhis.completeness.DataSetCompletenessService; import org.hisp.dhis.completeness.DataSetCompletenessStore; @@ -38,7 +45,6 @@ import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.scheduling.TaskId; -import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.filter.DataSetWithOrganisationUnitsFilter; import org.hisp.dhis.system.notification.Notifier; import org.hisp.dhis.system.util.Clock; @@ -49,13 +55,6 @@ import org.hisp.dhis.system.util.SystemUtils; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.Future; - -import static org.hisp.dhis.system.notification.NotificationLevel.INFO; - /** * @author Lars Helge Overland */ @@ -101,13 +100,6 @@ this.dataSetService = dataSetService; } - private SystemSettingManager systemSettingManager; - - public void setSystemSettingManager( SystemSettingManager systemSettingManager ) - { - this.systemSettingManager = systemSettingManager; - } - private Notifier notifier; public void setNotifier( Notifier notifier ) === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2013-09-30 10:39:35 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2013-09-30 11:28:56 +0000 @@ -28,6 +28,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.system.util.ConversionUtils.getIdentifiers; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.Future; + import org.amplecode.quick.BatchHandler; import org.amplecode.quick.BatchHandlerFactory; import org.apache.commons.collections.CollectionUtils; @@ -47,19 +55,10 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; -import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.util.ConversionUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.Future; - -import static org.hisp.dhis.system.util.ConversionUtils.getIdentifiers; - /** * @author Lars Helge Overland */ @@ -121,13 +120,6 @@ this.completenessStore = completenessStore; } - private SystemSettingManager systemSettingManager; - - public void setSystemSettingManager( SystemSettingManager systemSettingManager ) - { - this.systemSettingManager = systemSettingManager; - } - // ------------------------------------------------------------------------- // DataSetCompletenessService implementation // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-09-30 10:39:35 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-09-30 11:28:56 +0000 @@ -85,7 +85,6 @@ - @@ -97,7 +96,6 @@ -