=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2014-05-28 11:48:43 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2014-05-28 19:07:45 +0000 @@ -105,9 +105,6 @@ // these are the ones that are available for dxf2 import private final static Map, String> importClasses; - // these are the ones that are available for dxf2 delete - private final static Map, String> deletableClasses; - static { allExportClasses = Maps.newLinkedHashMap(); @@ -159,7 +156,6 @@ allExportClasses.put( ReportTable.class, "reportTables" ); allExportClasses.put( Report.class, "reports" ); allExportClasses.put( Chart.class, "charts" ); - allExportClasses.put( EventReport.class, "eventReports" ); allExportClasses.put( DataApprovalLevel.class, "dataApprovalLevels" ); @@ -184,6 +180,8 @@ allExportClasses.put( Program.class, "programs" ); allExportClasses.put( ProgramValidation.class, "programValidations" ); + allExportClasses.put( EventReport.class, "eventReports" ); + allExportClasses.put( BaseDimensionalObject.class, "dimensions" ); exportClasses = Maps.newLinkedHashMap( allExportClasses ); @@ -206,11 +204,6 @@ allExportClasses.put( MetaDataFilter.class, "metaDataFilters" ); exportClasses.remove( MetaDataFilter.class ); importClasses.remove( MetaDataFilter.class ); - - deletableClasses = Maps.newLinkedHashMap( importClasses ); - deletableClasses.remove( User.class ); - deletableClasses.remove( UserGroup.class ); - deletableClasses.remove( UserAuthorityGroup.class ); } public static Map, String> getAllExportMap() @@ -232,14 +225,4 @@ { return Lists.newArrayList( importClasses.keySet() ); } - - public static Map, String> getDeletableMap() - { - return Collections.unmodifiableMap( deletableClasses ); - } - - public static List> getDeletableClasses() - { - return Lists.newArrayList( deletableClasses.keySet() ); - } }