Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
05/24/08 14:37:02 (6 months ago)
Author:
bwolfe
Message:

Merging api-refactoring to trunk [3595]:[4355]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4158 r4358  
    2828import org.openmrs.api.EncounterService; 
    2929import org.openmrs.api.FormService; 
     30import org.openmrs.api.LocationService; 
    3031import org.openmrs.api.ObsService; 
    3132import org.openmrs.api.OrderService; 
    …… 
    141142                return (EncounterService)getService(EncounterService.class); 
    142143        } 
     144         
     145        /** 
     146         * @return location services 
     147         */ 
     148        public LocationService getLocationService() { 
     149                return (LocationService)getService(LocationService.class); 
     150        } 
    143151 
    144152        /** 
    …… 
    324332        } 
    325333 
     334        /** 
     335         * @param locationService the LocationService to set 
     336         */ 
     337        public void setLocationService(LocationService locationService) { 
     338                setService(LocationService.class, locationService); 
     339        } 
     340         
    326341        /** 
    327342         * @param formService the formService to set 
    …… 
    502517        @SuppressWarnings("unchecked") 
    503518    public Object getService(Class cls) { 
    504                 if (log.isDebugEnabled()) 
    505                         log.debug("Getting service: " + cls); 
     519                if (log.isTraceEnabled()) 
     520                        log.trace("Getting service: " + cls); 
    506521                 
    507522                // if the context is refreshing, wait until it is