Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
07/16/08 12:29:31 (6 months ago)
Author:
bwolfe
Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/1.3.x/src/api/org/openmrs/api/EncounterService.java

    r4501 r4947  
    5454        @Authorized( { OpenmrsConstants.PRIV_ADD_ENCOUNTERS, 
    5555                OpenmrsConstants.PRIV_EDIT_ENCOUNTERS }) 
    56         public void saveEncounter(Encounter encounter) throws APIException; 
     56        public Encounter saveEncounter(Encounter encounter) throws APIException; 
    5757 
    5858        /** 
    …… 
    126126         */ 
    127127        @Authorized( { OpenmrsConstants.PRIV_EDIT_ENCOUNTERS }) 
    128         public void voidEncounter(Encounter encounter, String reason); 
     128        public Encounter voidEncounter(Encounter encounter, String reason); 
    129129 
    130130        /** 
    …… 
    134134         */ 
    135135        @Authorized( { OpenmrsConstants.PRIV_EDIT_ENCOUNTERS }) 
    136         public void unvoidEncounter(Encounter encounter) throws APIException; 
     136        public Encounter unvoidEncounter(Encounter encounter) throws APIException; 
    137137 
    138138        /** 
    …… 
    166166         */ 
    167167        @Authorized( { OpenmrsConstants.PRIV_MANAGE_ENCOUNTER_TYPES }) 
    168         public void saveEncounterType(EncounterType encounterType); 
     168        public EncounterType saveEncounterType(EncounterType encounterType); 
    169169 
    170170        /** 
    …… 
    237237         */ 
    238238        @Authorized( { OpenmrsConstants.PRIV_MANAGE_ENCOUNTER_TYPES }) 
    239         public void retireEncounterType(EncounterType encounterType, String reason) 
     239        public EncounterType retireEncounterType(EncounterType encounterType, String reason) 
    240240                throws APIException; 
    241241 
    …… 
    248248         */ 
    249249        @Authorized( { OpenmrsConstants.PRIV_MANAGE_ENCOUNTER_TYPES }) 
    250         public void unretireEncounterType(EncounterType encounterType) 
     250        public EncounterType unretireEncounterType(EncounterType encounterType) 
    251251                throws APIException; 
    252252