OpenMRS

Timestamp:

07/17/08 15:20:10 (6 months ago)

Author:

catullus

Message:

sync-bidrectional: partly merge

Files:

• openmrs/branches/data_synchronization_bidirectional (modified) (1 prop)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/EncounterType.java (modified) (2 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/EncounterType.java

@@ -33 +33 @@
-        private Date dateCreated;
-        private User creator;
+        private User retiredBy;
+        private Boolean retired = Boolean.FALSE;
+        private Date dateRetired;
+        private String retireReason;
-        private String guid;
-    private transient String lastRecordGuid;
@@ -157 +161 @@
-                return name;
-        }
+        
+        /**
+     * @return the retiredBy
+     */
+    public User getRetiredBy() {
+        return retiredBy;
+    }
+
+        /**
+     * @param retiredBy the retiredBy to set
+     */
+    public void setRetiredBy(User retiredBy) {
+        this.retiredBy = retiredBy;
+    }
+
+        /**
+     * @return the retired
+     */
+    public Boolean getRetired() {
+        return retired;
+    }
+
+        /**
+     * @param retired the retired to set
+     */
+    public void setRetired(Boolean retired) {
+        this.retired = retired;
+    }
+
+        /**
+     * @return the dateRetired
+     */
+    public Date getDateRetired() {
+        return dateRetired;
+    }
+
+        /**
+     * @param dateRetired the dateRetired to set
+     */
+    public void setDateRetired(Date dateRetired) {
+        this.dateRetired = dateRetired;
+    }
+
+        /**
+     * @return the retireReason
+     */
+    public String getRetireReason() {
+        return retireReason;
+    }
+
+        /**
+     * @param retireReason the retireReason to set
+     */
+    public void setRetireReason(String retireReason) {
+        this.retireReason = retireReason;
+    }
+        
-}