=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2011-07-06 07:54:32 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2011-07-21 09:11:58 +0000 @@ -29,6 +29,7 @@ import org.hisp.dhis.caseaggregation.CaseAggregationCondition; import org.hisp.dhis.chart.Chart; +import org.hisp.dhis.chart.ChartGroup; import org.hisp.dhis.concept.Concept; import org.hisp.dhis.constant.Constant; import org.hisp.dhis.datadictionary.DataDictionary; @@ -77,6 +78,7 @@ import org.hisp.dhis.relationship.Relationship; import org.hisp.dhis.relationship.RelationshipType; import org.hisp.dhis.report.Report; +import org.hisp.dhis.report.ReportGroup; import org.hisp.dhis.reporttable.ReportTable; import org.hisp.dhis.user.User; import org.hisp.dhis.user.UserAuthorityGroup; @@ -119,6 +121,15 @@ return true; } + public void deleteChartGroup( ChartGroup group ) + { + } + + public boolean allowDeleteChartGroup( ChartGroup group ) + { + return true; + } + public void deleteDataDictionary( DataDictionary dataDictionary ) { } @@ -362,6 +373,15 @@ return true; } + public void deleteReportGroup( ReportGroup group ) + { + } + + public boolean allowDeleteReportGroup( ReportGroup group ) + { + return true; + } + public void deleteReportTable( ReportTable reportTable ) { } @@ -371,6 +391,15 @@ return true; } + public void deleteReportTableGroup( ReportTable group ) + { + } + + public boolean allowReportTableGroup( ReportTable group ) + { + return true; + } + public void deleteUser( User user ) { } @@ -538,7 +567,7 @@ public void deleteRelationshipType( RelationshipType relationshipType ) { } - + public boolean allowDeleteProgram( Program program ) { return true; @@ -556,7 +585,7 @@ public void deleteProgramInstance( ProgramInstance programInstance ) { } - + public boolean allowDeleteProgramStage( ProgramStage programStage ) { return true; @@ -565,7 +594,7 @@ public void deleteProgramStage( ProgramStage programStage ) { } - + public boolean allowDeleteProgramStageInstance( ProgramStageInstance programStageInstance ) { return true; @@ -574,7 +603,7 @@ public void deleteProgramStageInstance( ProgramStageInstance programStageInstance ) { } - + public boolean allowDeleteProgramStageDataElement( ProgramStageDataElement programStageDataElement ) { return true; @@ -583,7 +612,7 @@ public void deleteProgramStageDataElement( ProgramStageDataElement programStageDataElement ) { } - + public boolean allowDeletePatientDataValue( PatientDataValue patientDataValue ) { return true; @@ -592,7 +621,7 @@ public void deletePatientDataValue( PatientDataValue patientDataValue ) { } - + public boolean allowDeleteValidationCriteria( ValidationCriteria validationCriteria ) { return true; @@ -601,7 +630,7 @@ public void deleteValidationCriteria( ValidationCriteria validationCriteria ) { } - + public boolean allowDeleteProgramAttributeValue( ProgramAttributeValue programAttributeValue ) { return true; @@ -610,22 +639,23 @@ public void deleteProgramAttributeValue( ProgramAttributeValue programAttributeValue ) { } - + public boolean allowDeleteConstant( Constant constant ) { return true; } - + public void deleteConstant( Constant constant ) { } - + public boolean allowDeleteCaseAggregationCondition( CaseAggregationCondition caseAggregationCondition ) { return true; } - + public void deleteCaseAggregationCondition( CaseAggregationCondition caseAggregationCondition ) { } + }