Downloads Documentation Community Contribute Demo






Show Sidebar
Login | Register
Show
Ignore:
Timestamp:
07/17/08 15:20:10 (6 months ago)
Author:
catullus
Message:

sync-bidrectional: partly merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • openmrs/branches/data_synchronization_bidirectional

    • Property svn:ignore changed from
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      to
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      *.iws
      *.ipr
      *.iml
  • openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/ConceptProposal.java

    r4096 r4969  
    1919import org.apache.commons.logging.LogFactory; 
    2020import org.openmrs.synchronization.Synchronizable; 
     21import org.openmrs.util.OpenmrsConstants; 
    2122 
    2223/** 
     
    288289                this.mappedConcept = mappedConcept; 
    289290        } 
     291         
     292        /** 
     293         * Convenience method to mark this proposal as rejected. 
     294         *  
     295         * Be sure to call Context.getConceptService().saveConceptProposal(/thisObject/) 
     296         * after calling this method 
     297         *  
     298         */ 
     299        public void rejectConceptProposal() { 
     300                setState(OpenmrsConstants.CONCEPT_PROPOSAL_REJECT); 
     301                setFinalText(""); 
     302        } 
    290303 
    291304}