=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java 2010-05-31 13:53:07 +0000 @@ -94,7 +94,7 @@ OrganisationUnitService organisationUnitService, PeriodService periodService ) { - this.completeDataSetRegistrationService = completeDataSetRegistrationService; + this.registrationService = completeDataSetRegistrationService; this.dataSetService = dataSetService; this.organisationUnitService = organisationUnitService; this.periodService = periodService; @@ -144,7 +144,7 @@ { writer.openElement( COLLECTION_NAME ); - registrations = completeDataSetRegistrationService.getCompleteDataSetRegistrations( dataSets, units, periods ); + registrations = registrationService.getCompleteDataSetRegistrations( dataSets, units, periods ); for ( final CompleteDataSetRegistration registration : registrations ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/CalculatedDataElementImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/CalculatedDataElementImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/CalculatedDataElementImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.CalculatedDataElement; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementService; @@ -44,10 +45,17 @@ { protected DataElementService dataElementService; - // ------------------------------------------------------------------------- - // Importer implementation - // ------------------------------------------------------------------------- - + public CalculatedDataElementImporter() + { + } + + public CalculatedDataElementImporter( BatchHandler batchHandler, DataElementService dataElementService ) + { + this.batchHandler = batchHandler; + this.dataElementService = dataElementService; + } + + @Override public void importObject( CalculatedDataElement object, ImportParams params ) { NameMappingUtil.addDataElementMapping( object.getId(), object.getName() ); @@ -55,16 +63,14 @@ read( object, GroupMemberType.NONE, params ); } - - // ------------------------------------------------------------------------- - // Overridden methods - // ------------------------------------------------------------------------- + @Override protected void importUnique( CalculatedDataElement object ) { dataElementService.addDataElement( object ); } - + + @Override protected void importMatching( CalculatedDataElement object, CalculatedDataElement match ) { match.setUuid( object.getUuid() ); @@ -82,7 +88,8 @@ dataElementService.updateDataElement( match ); } - + + @Override protected CalculatedDataElement getMatching( CalculatedDataElement object ) { DataElement match = dataElementService.getDataElementByName( object.getName() ); @@ -106,6 +113,7 @@ return calculated; } + @Override protected boolean isIdentical( CalculatedDataElement object, CalculatedDataElement existing ) { if ( !object.getName().equals( existing.getName() ) ) === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/CompleteDataSetRegistrationImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/CompleteDataSetRegistrationImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/CompleteDataSetRegistrationImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataset.CompleteDataSetRegistration; import org.hisp.dhis.dataset.CompleteDataSetRegistrationService; import org.hisp.dhis.importexport.GroupMemberType; @@ -42,8 +43,19 @@ { protected ImportParams params; - protected CompleteDataSetRegistrationService completeDataSetRegistrationService; - + protected CompleteDataSetRegistrationService registrationService; + + public CompleteDataSetRegistrationImporter() + { + } + + public CompleteDataSetRegistrationImporter( BatchHandler batchHandler, CompleteDataSetRegistrationService registrationService, ImportParams params ) + { + this.batchHandler = batchHandler; + this.registrationService = registrationService; + this.params = params; + } + @Override public void importObject( CompleteDataSetRegistration object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.datadictionary.DataDictionary; import org.hisp.dhis.datadictionary.DataDictionaryService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataDictionaryService dataDictionaryService; + public DataDictionaryImporter() + { + } + + public DataDictionaryImporter( BatchHandler batchHandler, DataDictionaryService dataDictionaryService ) + { + this.batchHandler = batchHandler; + this.dataDictionaryService = dataDictionaryService; + } + @Override public void importObject( DataDictionary object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.DataElementCategoryCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataElementCategoryService categoryService; + public DataElementCategoryComboImporter() + { + } + + public DataElementCategoryComboImporter( BatchHandler batchHandler, DataElementCategoryService categoryService ) + { + this.batchHandler = batchHandler; + this.categoryService = categoryService; + } + @Override public void importObject( DataElementCategoryCombo object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.DataElementCategory; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataElementCategoryService categoryService; + public DataElementCategoryImporter() + { + } + + public DataElementCategoryImporter( BatchHandler batchHandler, DataElementCategoryService categoryService ) + { + this.batchHandler = batchHandler; + this.categoryService = categoryService; + } + @Override public void importObject( DataElementCategory object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataElementCategoryService categoryService; + public DataElementCategoryOptionComboImporter() + { + } + + public DataElementCategoryOptionComboImporter( BatchHandler batchHandler, DataElementCategoryService categoryService ) + { + this.batchHandler = batchHandler; + this.categoryService = categoryService; + } + @Override public void importObject( DataElementCategoryOptionCombo object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.DataElementCategoryOption; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataElementCategoryService categoryService; + public DataElementCategoryOptionImporter() + { + } + + public DataElementCategoryOptionImporter( BatchHandler batchHandler, DataElementCategoryService categoryService ) + { + this.batchHandler = batchHandler; + this.categoryService = categoryService; + } + @Override public void importObject( DataElementCategoryOption object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataElementService dataElementService; + public DataElementGroupImporter() + { + } + + public DataElementGroupImporter( BatchHandler batchHandler, DataElementService dataElementService ) + { + this.batchHandler = batchHandler; + this.dataElementService = dataElementService; + } + @Override public void importObject( DataElementGroup object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupSetImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupSetImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupSetImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.DataElementGroupSet; import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataElementService dataElementService; + public DataElementGroupSetImporter() + { + } + + public DataElementGroupSetImporter( BatchHandler batchHandler, DataElementService dataElementService ) + { + this.batchHandler = batchHandler; + this.dataElementService = dataElementService; + } + @Override public void importObject( DataElementGroupSet object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataelement.CalculatedDataElement; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementService; @@ -44,6 +45,16 @@ { protected DataElementService dataElementService; + public DataElementImporter() + { + } + + public DataElementImporter( BatchHandler batchHandler, DataElementService dataElementService ) + { + this.batchHandler = batchHandler; + this.dataElementService = dataElementService; + } + @Override public void importObject( DataElement object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.importexport.GroupMemberType; @@ -43,6 +44,16 @@ { protected DataSetService dataSetService; + public DataSetImporter() + { + } + + public DataSetImporter( BatchHandler batchHandler, DataSetService dataSetService ) + { + this.batchHandler = batchHandler; + this.dataSetService = dataSetService; + } + @Override public void importObject( DataSet object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.datamart.DataMartService; import org.hisp.dhis.datavalue.DataValue; import org.hisp.dhis.datavalue.DataValueService; @@ -47,6 +48,18 @@ protected ImportParams params; + public DataValueImporter() + { + } + + public DataValueImporter( BatchHandler batchHandler, DataValueService dataValueService, DataMartService dataMartService, ImportParams params ) + { + this.batchHandler = batchHandler; + this.dataValueService = dataValueService; + this.dataMartService = dataMartService; + this.params = params; + } + @Override public void importObject( DataValue object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ExtendedDataElementImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ExtendedDataElementImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ExtendedDataElementImporter.java 2010-05-31 13:53:07 +0000 @@ -47,6 +47,17 @@ protected DataElementService dataElementService; + public ExtendedDataElementImporter() + { + } + + public ExtendedDataElementImporter( BatchHandler batchHandler, BatchHandler extendedDataElementBatchHandler, DataElementService dataElementService ) + { + this.batchHandler = batchHandler; + this.extendedDataElementBatchHandler = extendedDataElementBatchHandler; + this.dataElementService = dataElementService; + } + @Override public void importObject( DataElement object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ExtendedIndicatorImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ExtendedIndicatorImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ExtendedIndicatorImporter.java 2010-05-31 13:53:07 +0000 @@ -47,6 +47,16 @@ protected IndicatorService indicatorService; + public ExtendedIndicatorImporter() + { + } + + public ExtendedIndicatorImporter( BatchHandler batchHandler, IndicatorService indicatorService ) + { + this.batchHandler = batchHandler; + this.indicatorService = indicatorService; + } + @Override public void importObject( Indicator object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.java 2010-05-31 13:53:07 +0000 @@ -33,7 +33,7 @@ * @author Lars Helge Overland * @version $Id: AbstractGroupMemberConverter.java 4674 2008-03-04 16:09:50Z larshelg $ */ -public class GroupMemberImporter +public abstract class GroupMemberImporter extends AbstractImporter { // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupSetImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupSetImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupSetImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -43,6 +44,16 @@ { protected OrganisationUnitGroupService organisationUnitGroupService; + public GroupSetImporter() + { + } + + public GroupSetImporter( BatchHandler batchHandler, OrganisationUnitGroupService organisationUnitGroupService ) + { + this.batchHandler = batchHandler; + this.organisationUnitGroupService = organisationUnitGroupService; + } + @Override public void importObject( OrganisationUnitGroupSet object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -43,6 +44,16 @@ { protected IndicatorService indicatorService; + public IndicatorGroupImporter() + { + } + + public IndicatorGroupImporter( BatchHandler batchHandler, IndicatorService indicatorService ) + { + this.batchHandler = batchHandler; + this.indicatorService = indicatorService; + } + @Override public void importObject( IndicatorGroup object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupSetImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupSetImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupSetImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -43,6 +44,16 @@ { protected IndicatorService indicatorService; + public IndicatorGroupSetImporter() + { + } + + public IndicatorGroupSetImporter( BatchHandler batchHandler, IndicatorService indicatorService ) + { + this.batchHandler = batchHandler; + this.indicatorService = indicatorService; + } + @Override public void importObject( IndicatorGroupSet object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -43,6 +44,16 @@ { protected IndicatorService indicatorService; + public IndicatorImporter() + { + } + + public IndicatorImporter( BatchHandler batchHandler, IndicatorService indicatorService ) + { + this.batchHandler = batchHandler; + this.indicatorService = indicatorService; + } + @Override public void importObject( Indicator object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorTypeImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorTypeImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorTypeImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -43,6 +44,16 @@ { protected IndicatorService indicatorService; + public IndicatorTypeImporter() + { + } + + public IndicatorTypeImporter( BatchHandler batchHandler, IndicatorService indicatorService ) + { + this.batchHandler = batchHandler; + this.indicatorService = indicatorService; + } + @Override public void importObject( IndicatorType object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OlapUrlImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OlapUrlImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OlapUrlImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -42,6 +43,16 @@ { protected OlapURLService olapURLService; + public OlapUrlImporter() + { + } + + public OlapUrlImporter( BatchHandler batchHandler, OlapURLService olapURLService ) + { + this.batchHandler = batchHandler; + this.olapURLService = olapURLService; + } + @Override public void importObject( OlapURL object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitGroupImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitGroupImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitGroupImporter.java 2010-05-31 13:53:07 +0000 @@ -1,5 +1,6 @@ package org.hisp.dhis.importexport.importer; +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -39,6 +40,16 @@ { protected OrganisationUnitGroupService organisationUnitGroupService; + public OrganisationUnitGroupImporter() + { + } + + public OrganisationUnitGroupImporter( BatchHandler batchHandler, OrganisationUnitGroupService organisationUnitGroupService ) + { + this.batchHandler = batchHandler; + this.organisationUnitGroupService = organisationUnitGroupService; + } + @Override public void importObject( OrganisationUnitGroup object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java 2010-05-31 13:53:07 +0000 @@ -47,6 +47,16 @@ protected BatchHandler sourceBatchHandler; + public OrganisationUnitImporter() + { + } + + public OrganisationUnitImporter( BatchHandler batchHandler, OrganisationUnitService organisationUnitService ) + { + this.batchHandler = batchHandler; + this.organisationUnitService = organisationUnitService; + } + @Override public void importObject( OrganisationUnit object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitLevelImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitLevelImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitLevelImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -42,6 +43,16 @@ { protected OrganisationUnitService organisationUnitService; + public OrganisationUnitLevelImporter() + { + } + + public OrganisationUnitLevelImporter( BatchHandler batchHandler, OrganisationUnitService organisationUnitService ) + { + this.batchHandler = batchHandler; + this.organisationUnitService = organisationUnitService; + } + @Override public void importObject( OrganisationUnitLevel object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitRelationshipImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitRelationshipImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitRelationshipImporter.java 2010-05-31 13:53:07 +0000 @@ -43,6 +43,16 @@ protected BatchHandler organisationUnitBatchHandler; + public OrganisationUnitRelationshipImporter() + { + } + + public OrganisationUnitRelationshipImporter( BatchHandler batchHandler, OrganisationUnitService organisationUnitService ) + { + this.organisationUnitBatchHandler = batchHandler; + this.organisationUnitService = organisationUnitService; + } + // ------------------------------------------------------------------------- // Overridden methods // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/PeriodImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/PeriodImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/PeriodImporter.java 2010-05-31 13:53:07 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.amplecode.quick.BatchHandler; import org.hisp.dhis.importexport.GroupMemberType; import org.hisp.dhis.importexport.ImportParams; import org.hisp.dhis.importexport.Importer; @@ -44,6 +45,16 @@ { protected PeriodService periodService; + public PeriodImporter() + { + } + + public PeriodImporter( BatchHandler batchHandler, PeriodService periodService ) + { + this.batchHandler = batchHandler; + this.periodService = periodService; + } + @Override public void importObject( Period object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ReportTableImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ReportTableImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ReportTableImporter.java 2010-05-31 13:53:07 +0000 @@ -60,6 +60,15 @@ protected OrganisationUnitService organisationUnitService; + public ReportTableImporter() + { + } + + public ReportTableImporter( ReportTableService reportTableService ) + { + this.reportTableService = reportTableService; + } + @Override public void importObject( ReportTable object, ImportParams params ) { === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java 2010-05-31 13:53:07 +0000 @@ -45,6 +45,16 @@ protected ExpressionService expressionService; + public ValidationRuleImporter() + { + } + + public ValidationRuleImporter( ValidationRuleService validationRuleService, ExpressionService expressionService ) + { + this.validationRuleService = validationRuleService; + this.expressionService = expressionService; + } + @Override public void importObject( ValidationRule object, ImportParams params ) {