=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2010-05-12 13:38:28 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2011-04-22 18:38:43 +0000 @@ -31,8 +31,8 @@ import java.util.Date; import org.hisp.dhis.common.ImportableObject; +import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import org.hisp.dhis.source.Source; /** * @author Lars Helge Overland @@ -45,7 +45,7 @@ private Period period; - private Source source; + private OrganisationUnit source; private Date date; @@ -57,7 +57,7 @@ { } - public CompleteDataSetRegistration( DataSet dataSet, Period period, Source source, Date date ) + public CompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source, Date date ) { this.dataSet = dataSet; this.period = period; @@ -179,12 +179,12 @@ this.period = period; } - public Source getSource() + public OrganisationUnit getSource() { return source; } - public void setSource( Source source ) + public void setSource( OrganisationUnit source ) { this.source = source; } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationService.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationService.java 2011-04-22 18:38:43 +0000 @@ -30,8 +30,8 @@ import java.util.Collection; import java.util.Date; +import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import org.hisp.dhis.source.Source; /** * @author Lars Helge Overland @@ -57,7 +57,7 @@ * @param source the Source. * @return the CompleteDataSetRegistration. */ - CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, Source source ); + CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source ); /** * Deletes a CompleteDataSetRegistration. @@ -83,7 +83,7 @@ * @return a Collection of CompleteDataSetRegistrations. */ Collection getCompleteDataSetRegistrations( - Collection dataSets, Collection sources, Collection periods ); + Collection dataSets, Collection sources, Collection periods ); /** * Retrieves the number of existing CompleteDataSetRegistration for the given @@ -94,7 +94,7 @@ * @param period the Period. * @return the number of existing CompleteDataSetRegistrations. */ - int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period ); + int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period ); /** * Retrieves the number of existing CompleteDataSetRegistration for the given @@ -108,7 +108,7 @@ * @param deadline the dead line. * @return the number of existing CompleteDataSetRegistrations. */ - int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period, Date deadline ); + int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period, Date deadline ); /** * Deletes the CompleteDataSetRegistrations associated with the given DataSet. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStore.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStore.java 2011-04-22 18:38:43 +0000 @@ -30,8 +30,8 @@ import java.util.Collection; import java.util.Date; +import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import org.hisp.dhis.source.Source; /** * @author Lars Helge Overland @@ -57,7 +57,7 @@ * @param source the Source. * @return the CompleteDataSetRegistration. */ - CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, Source source ); + CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source ); /** * Deletes a CompleteDataSetRegistration. @@ -76,7 +76,7 @@ * @return the number of existing CompleteDataSetRegistrations. */ Collection getCompleteDataSetRegistrations( - DataSet dataSet, Collection sources, Period period ); + DataSet dataSet, Collection sources, Period period ); /** * Retrieves all CompleteDataSetRegistration. @@ -95,7 +95,7 @@ * @return a Collection of CompleteDataSetRegistrations. */ Collection getCompleteDataSetRegistrations( - Collection dataSets, Collection sources, Collection periods ); + Collection dataSets, Collection sources, Collection periods ); /** * Retrieves a Collection of CompleteDataSetRegistrations for the given DataSet, @@ -109,7 +109,7 @@ * @return a Collection of CompleteDataSetRegistrations. */ Collection getCompleteDataSetRegistrations( - DataSet dataSet, Collection sources, Period period, Date deadline ); + DataSet dataSet, Collection sources, Period period, Date deadline ); /** * Deletes the CompleteDataSetRegistrations associated with the given DataSet. === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java 2010-04-21 14:32:54 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java 2011-04-22 18:38:43 +0000 @@ -27,8 +27,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import org.hisp.dhis.source.Source; import org.hisp.dhis.system.deletion.DeletionHandler; import org.springframework.jdbc.core.JdbcTemplate; @@ -83,12 +83,11 @@ } @Override - public void deleteSource( Source source ) + public void deleteOrganisationUnit( OrganisationUnit unit ) // TODO inefficient, use query { - for ( CompleteDataSetRegistration registration : completeDataSetRegistrationService - .getAllCompleteDataSetRegistrations() ) + for ( CompleteDataSetRegistration registration : completeDataSetRegistrationService.getAllCompleteDataSetRegistrations() ) { - if ( registration.getSource().equals( source ) ) + if ( registration.getSource().equals( unit ) ) { completeDataSetRegistrationService.deleteCompleteDataSetRegistration( registration ); } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java 2011-03-01 17:14:27 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java 2011-04-22 18:38:43 +0000 @@ -27,8 +27,8 @@ import java.util.Date; import org.apache.commons.collections.CollectionUtils; +import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import org.hisp.dhis.source.Source; import org.springframework.transaction.annotation.Transactional; /** @@ -63,7 +63,7 @@ completeDataSetRegistrationStore.deleteCompleteDataSetRegistration( registration ); } - public CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, Source source ) + public CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source ) { return completeDataSetRegistrationStore.getCompleteDataSetRegistration( dataSet, period, source ); } @@ -74,16 +74,16 @@ } public Collection getCompleteDataSetRegistrations( - Collection dataSets, Collection sources, Collection periods ) + Collection dataSets, Collection sources, Collection periods ) { return completeDataSetRegistrationStore.getCompleteDataSetRegistrations( dataSets, sources, periods ); } @SuppressWarnings( "unchecked" ) @Deprecated - public int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period ) + public int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period ) { - final Collection intersectingSources = CollectionUtils.intersection( sources, dataSet.getSources() ); + final Collection intersectingSources = CollectionUtils.intersection( sources, dataSet.getSources() ); if ( intersectingSources == null || intersectingSources.size() == 0 ) { @@ -95,9 +95,9 @@ @SuppressWarnings( "unchecked" ) @Deprecated - public int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period, Date deadline ) + public int getCompleteDataSetRegistrationsForDataSet( DataSet dataSet, Collection sources, Period period, Date deadline ) { - final Collection intersectingSources = CollectionUtils.intersection( sources, dataSet.getSources() ); + final Collection intersectingSources = CollectionUtils.intersection( sources, dataSet.getSources() ); if ( intersectingSources == null || intersectingSources.size() == 0 ) { === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java 2010-10-29 12:19:15 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java 2011-04-22 18:38:43 +0000 @@ -33,9 +33,9 @@ import org.hisp.dhis.dataset.CompleteDataSetRegistration; import org.hisp.dhis.dataset.CompleteDataSetRegistrationStore; import org.hisp.dhis.dataset.DataSet; +import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; -import org.hisp.dhis.source.Source; /** * @author Lars Helge Overland @@ -92,7 +92,7 @@ sessionFactory.getCurrentSession().save( registration ); } - public CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, Source source ) + public CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source ) { period = reloadPeriod( period ); @@ -114,7 +114,7 @@ @SuppressWarnings( "unchecked" ) public Collection getCompleteDataSetRegistrations( - DataSet dataSet, Collection sources, Period period ) + DataSet dataSet, Collection sources, Period period ) { period = reloadPeriod( period ); @@ -135,7 +135,7 @@ @SuppressWarnings( "unchecked" ) public Collection getCompleteDataSetRegistrations( - Collection dataSets, Collection sources, Collection periods ) + Collection dataSets, Collection sources, Collection periods ) { for ( Period period : periods ) { @@ -153,7 +153,7 @@ @SuppressWarnings( "unchecked" ) public Collection getCompleteDataSetRegistrations( - DataSet dataSet, Collection sources, Period period, Date deadline ) + DataSet dataSet, Collection sources, Period period, Date deadline ) { period = reloadPeriod( period ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-04-22 17:02:27 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-04-22 18:38:43 +0000 @@ -270,6 +270,7 @@ executeSql( "ALTER TABLE datasetsource DROP CONSTRAINT fk766ae2938fd8026a" ); executeSql( "ALTER TABLE datasetlocksource DROP CONSTRAINT fk582fdf7e8fd8026a" ); + executeSql( "ALTER TABLE completedatasetregistration DROP CONSTRAINT fk_datasetcompleteregistration_sourceid" ); log.info( "Tables updated" ); } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2011-04-12 13:25:06 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2011-04-22 18:38:43 +0000 @@ -11,10 +11,8 @@ foreign-key="fk_datasetcompleteregistration_datasetid" /> - - + === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/source/hibernate/Source.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/source/hibernate/Source.hbm.xml 2011-04-12 13:25:06 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/source/hibernate/Source.hbm.xml 2011-04-22 18:38:43 +0000 @@ -6,8 +6,6 @@ - - === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java 2011-04-22 17:02:27 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java 2011-04-22 18:38:43 +0000 @@ -39,11 +39,10 @@ import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.organisationunit.OrganisationUnit; +import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.MonthlyPeriodType; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; -import org.hisp.dhis.source.Source; -import org.hisp.dhis.source.SourceStore; import org.junit.Test; /** @@ -97,15 +96,15 @@ periodService = (PeriodService) getBean( PeriodService.ID ); - sourceStore = (SourceStore) getBean( SourceStore.ID ); - + organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID ); + sourceA = createOrganisationUnit( 'A' ); sourceB = createOrganisationUnit( 'B' ); sourceC = createOrganisationUnit( 'C' ); - sourceStore.addSource( sourceA ); - sourceStore.addSource( sourceB ); - sourceStore.addSource( sourceC ); + organisationUnitService.addOrganisationUnit( sourceA ); + organisationUnitService.addOrganisationUnit( sourceB ); + organisationUnitService.addOrganisationUnit( sourceC ); periodA = createPeriod( new MonthlyPeriodType(), getDate( 2000, 1, 1 ), getDate( 2000, 1, 31 ) ); periodB = createPeriod( new MonthlyPeriodType(), getDate( 2000, 2, 1 ), getDate( 2000, 2, 28 ) ); @@ -230,7 +229,7 @@ dataSets.add( dataSetB ); - Collection sources = new ArrayList(); + Collection sources = new ArrayList(); sources.add( sourceA ); sources.add( sourceB ); @@ -278,7 +277,7 @@ completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationK ); completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationL ); - Collection sources = new ArrayList(); + Collection sources = new ArrayList(); sources.add( sourceA ); sources.add( sourceB ); @@ -322,7 +321,7 @@ completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationK ); completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationL ); - Collection sources = new ArrayList(); + Collection sources = new ArrayList(); sources.add( sourceA ); sources.add( sourceB ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java 2011-04-22 18:38:43 +0000 @@ -38,12 +38,11 @@ import java.util.Date; import org.hisp.dhis.DhisSpringTest; -import org.hisp.dhis.mock.MockSource; +import org.hisp.dhis.organisationunit.OrganisationUnit; +import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.MonthlyPeriodType; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; -import org.hisp.dhis.source.Source; -import org.hisp.dhis.source.SourceStore; import org.junit.Test; /** @@ -70,8 +69,8 @@ private Period periodA; private Period periodB; - private Source sourceA; - private Source sourceB; + private OrganisationUnit sourceA; + private OrganisationUnit sourceB; private Date onTimeA; private Date onTimeB; @@ -92,16 +91,16 @@ periodService = (PeriodService) getBean( PeriodService.ID ); - sourceStore = (SourceStore) getBean( SourceStore.ID ); - + organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID ); + dataSetA = createDataSet( 'A', new MonthlyPeriodType() ); dataSetB = createDataSet( 'B', new MonthlyPeriodType() ); periodA = createPeriod( new MonthlyPeriodType(), getDate( 2000, 1, 1 ), getDate( 2000, 1, 31 ) ); periodB = createPeriod( new MonthlyPeriodType(), getDate( 2000, 2, 1 ), getDate( 2000, 2, 28 ) ); - sourceA = new MockSource( "SourceA" ); - sourceB = new MockSource( "SourceB" ); + sourceA = createOrganisationUnit( 'A' ); + sourceB = createOrganisationUnit( 'B' ); dataSetService.addDataSet( dataSetA ); dataSetService.addDataSet( dataSetB ); @@ -109,8 +108,8 @@ periodService.addPeriod( periodA ); periodService.addPeriod( periodB ); - sourceStore.addSource( sourceA ); - sourceStore.addSource( sourceB ); + organisationUnitService.addOrganisationUnit( sourceA ); + organisationUnitService.addOrganisationUnit( sourceB ); onTimeA = getDate( 2000, 1, 10 ); onTimeB = getDate( 2000, 2, 10 ); @@ -213,7 +212,7 @@ dataSets.add( dataSetB ); - Collection sources = new ArrayList(); + Collection sources = new ArrayList(); sources.add( sourceA ); sources.add( sourceB ); @@ -252,7 +251,7 @@ registrationStore.saveCompleteDataSetRegistration( registrationG ); registrationStore.saveCompleteDataSetRegistration( registrationH ); - Collection sources = new ArrayList(); + Collection sources = new ArrayList(); sources.add( sourceA ); sources.add( sourceB ); @@ -287,7 +286,7 @@ registrationStore.saveCompleteDataSetRegistration( registrationG ); registrationStore.saveCompleteDataSetRegistration( registrationH ); - Collection sources = new ArrayList(); + Collection sources = new ArrayList(); sources.add( sourceA ); sources.add( sourceB ); === 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-06-01 08:53:29 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java 2011-04-22 18:38:43 +0000 @@ -48,7 +48,6 @@ import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.period.PeriodType; -import org.hisp.dhis.source.Source; import org.hisp.dhis.system.util.DateUtils; /** @@ -176,7 +175,7 @@ Period period = periodType.createPeriod(); registration.setPeriod( period ); - Source source = new OrganisationUnit( "" ); + OrganisationUnit source = new OrganisationUnit( "" ); registration.setSource( source ); registration.getDataSet().setId( dataSetMapping.get( Integer.parseInt( values.get( FIELD_DATASET ) ) ) ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/RemoveEnrollmentAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/RemoveEnrollmentAction.java 2011-04-03 10:19:50 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/RemoveEnrollmentAction.java 2011-04-22 18:38:43 +0000 @@ -47,7 +47,6 @@ import org.hisp.dhis.program.ProgramAttributeService; import org.hisp.dhis.program.ProgramInstance; import org.hisp.dhis.program.ProgramInstanceService; -import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.programattributevalue.ProgramAttributeValue; import org.hisp.dhis.programattributevalue.ProgramAttributeValueService; @@ -68,8 +67,6 @@ private PatientService patientService; - private ProgramService programService; - private ProgramInstanceService programInstanceService; private ProgramAttributeService programAttributeService; @@ -99,11 +96,6 @@ this.patientService = patientService; } - public void setProgramService( ProgramService programService ) - { - this.programService = programService; - } - public void setProgramInstanceService( ProgramInstanceService programInstanceService ) { this.programInstanceService = programInstanceService; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateAddRelationshipPatientAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateAddRelationshipPatientAction.java 2011-03-31 01:42:05 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateAddRelationshipPatientAction.java 2011-04-22 18:38:43 +0000 @@ -67,10 +67,6 @@ private boolean underAge; - private Integer relationshipId; - - private Integer relationshipTypeId; - // ------------------------------------------------------------------------- // Output // ------------------------------------------------------------------------- @@ -344,16 +340,6 @@ this.underAge = underAge; } - public void setRelationshipTypeId( Integer relationshipTypeId ) - { - this.relationshipTypeId = relationshipTypeId; - } - - public void setRelationshipId( Integer relationshipId ) - { - this.relationshipId = relationshipId; - } - public void setAgeType( char ageType ) { this.ageType = ageType; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java 2011-03-31 01:42:05 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java 2011-04-22 18:38:43 +0000 @@ -102,7 +102,6 @@ return selectionManager.getSelectedOrganisationUnit(); } - @SuppressWarnings( "unchecked" ) public void setSelectedPatient( Patient patient ) { getSession().put( SESSION_KEY_SELECTED_PATIENT_ID, patient.getId() ); @@ -125,7 +124,6 @@ getSession().remove( SESSION_KEY_SELECTED_PATIENT_ID ); } - @SuppressWarnings( "unchecked" ) public void setSelectedProgram( Program program ) { getSession().put( SESSION_KEY_SELECTED_PROGRAM_ID, program.getId() ); @@ -148,7 +146,6 @@ getSession().remove( SESSION_KEY_SELECTED_PROGRAM_ID ); } - @SuppressWarnings( "unchecked" ) public void setSelectedProgramStage( ProgramStage programStage ) { getSession().put( SESSION_KEY_SELECTED_PROGRAMSTAGE_ID, programStage.getId() ); @@ -189,7 +186,6 @@ } } - @SuppressWarnings( "unchecked" ) public void setListAll( boolean listAll ) { getSession().put( SESSION_KEY_LISTALL, listAll ); @@ -199,7 +195,6 @@ // Search patients by patient-attribute // ------------------------------------------------------------------------- - @SuppressWarnings( "unchecked" ) public void setSearchingAttributeId( int searchingAttributeId ) { getSession().put( SESSION_KEY_SELECTED_SEARCHING_ATTRIBUTE_ID, searchingAttributeId ); @@ -215,7 +210,6 @@ getSession().remove( SESSION_KEY_SELECTED_SEARCHING_ATTRIBUTE_ID ); } - @SuppressWarnings( "unchecked" ) public void setSearchText( String searchText ) { getSession().put( SESSION_KEY_SPECIFIED_SEARCH_TEXT, searchText ); @@ -235,7 +229,6 @@ // Sort by patient-attribute // ------------------------------------------------------------------------- - @SuppressWarnings( "unchecked" ) public void setSortingAttributeId( int sortAttributeId ) { getSession().put( SESSION_KEY_SELECTED_SORT_ATTRIBUTE_ID, sortAttributeId ); @@ -255,8 +248,7 @@ // Supporting methods // ------------------------------------------------------------------------- - @SuppressWarnings("unchecked") - private static final Map getSession() + private static final Map getSession() { return ActionContext.getContext().getSession(); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2011-04-01 03:00:35 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2011-04-22 18:38:43 +0000 @@ -600,7 +600,6 @@ class="org.hisp.dhis.patient.action.patient.RemoveEnrollmentAction" scope="prototype"> - === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2011-04-12 13:16:13 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2011-04-22 18:38:43 +0000 @@ -52,7 +52,6 @@ import org.apache.commons.logging.LogFactory; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nFormat; -import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.mapping.export.SVGDocument; import org.hisp.dhis.mapping.export.SVGUtils; import org.hisp.dhis.organisationunit.OrganisationUnit; @@ -100,13 +99,6 @@ this.organisationUnitService = organisationUnitService; } - private IndicatorService indicatorService; - - public void setIndicatorService( IndicatorService indicatorService ) - { - this.indicatorService = indicatorService; - } - protected I18nFormat format; public void setFormat( I18nFormat format ) === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2011-04-12 13:16:13 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2011-04-22 18:38:43 +0000 @@ -33,8 +33,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.mapping.export.SVGDocument; import org.hisp.dhis.mapping.export.SVGUtils; import org.hisp.dhis.util.ContextUtils; @@ -54,24 +52,6 @@ private static final String SVGDOCUMENT = "SVGDOCUMENT"; // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private IndicatorService indicatorService; - - public void setIndicatorService( IndicatorService indicatorService ) - { - this.indicatorService = indicatorService; - } - - private DataElementService dataElementService; - - public void setDataElementService( DataElementService dataElementService ) - { - this.dataElementService = dataElementService; - } - - // ------------------------------------------------------------------------- // Output & input // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2011-03-08 15:14:32 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2011-04-22 18:38:43 +0000 @@ -325,14 +325,10 @@ - - - + scope="prototype"/> -