Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
05/09/08 10:53:35 (2 months ago)
Author:
bwolfe
Message:

Merging report-api-refactoring to trunk [2696]:[4157]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/trunk/src/api/org/openmrs/api/context/ServiceContext.java

    r4095 r4158  
    2525import org.openmrs.api.CohortService; 
    2626import org.openmrs.api.ConceptService; 
     27import org.openmrs.api.DataSetService; 
    2728import org.openmrs.api.EncounterService; 
    2829import org.openmrs.api.FormService; 
    …… 
    3334import org.openmrs.api.PersonService; 
    3435import org.openmrs.api.ProgramWorkflowService; 
     36import org.openmrs.api.ReportService; 
    3537import org.openmrs.api.UserService; 
    3638import org.openmrs.arden.ArdenService; 
    …… 
    3941import org.openmrs.notification.AlertService; 
    4042import org.openmrs.notification.MessageService; 
    41 import org.openmrs.reporting.ReportService; 
     43import org.openmrs.reporting.ReportObjectService; 
    4244import org.openmrs.scheduler.SchedulerService; 
    4345import org.openmrs.util.OpenmrsClassLoader; 
    …… 
    183185 
    184186        /** 
     187         * @return report object service 
     188         */ 
     189        public ReportObjectService getReportObjectService() { 
     190                return (ReportObjectService)getService(ReportObjectService.class); 
     191        } 
     192         
     193        /**  
    185194         * @return report service 
    186195         */ 
    187196        public ReportService getReportService() { 
    188                 return (ReportService)getService(ReportService.class); 
     197                return (ReportService) getService(ReportService.class); 
    189198        } 
    190199 
    …… 
    344353 
    345354        /** 
    346          * @param reportService the reportService to set 
     355         * @param reportObjectService the reportObjectService to set 
     356         */ 
     357        public void setReportObjectService(ReportObjectService reportObjectService) { 
     358                setService(ReportObjectService.class, reportObjectService); 
     359        } 
     360         
     361        /** 
     362         * @param reportService 
    347363         */ 
    348364        public void setReportService(ReportService reportService) { 
    349365                setService(ReportService.class, reportService); 
     366        } 
     367         
     368        /** 
     369         * @param dataSetService 
     370         */ 
     371        public void setDataSetService(DataSetService dataSetService) { 
     372                setService(DataSetService.class, dataSetService); 
     373        } 
     374 
     375        /**  
     376         * @return 
     377         */ 
     378        public DataSetService getDataSetService() { 
     379                return (DataSetService) getService(DataSetService.class); 
    350380        } 
    351381