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/Concept.java (modified) (5 diffs)

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

@@ -45 +45 @@
-        private Integer conceptId;
-        private Boolean retired = false;
+        private User retiredBy;
+        private Date dateRetired;
+        private String retireReason;
-        private ConceptDatatype datatype;
-        private ConceptClass conceptClass;
@@ -84 +87 @@
-                synonyms = new HashSet<ConceptSynonym>();
-                conceptSets = new HashSet<ConceptSet>();
-                //conceptNumeric = new ConceptNumeric();
-        }
-
@@ -334 +336 @@
-         */
-        public ConceptName getName(Locale locale, boolean exact) {
+                
+                // fail early if this concept has no names defined
+                if (getNames() == null || getNames().size() == 0) {
+                        log.debug("there are no names defined for: " + conceptId);
+                        return null;
+                }
+                
-                log.debug("Getting conceptName for locale: " + locale);
-                
@@ -343 +352 @@
-
-                String desiredLanguage = locale.getLanguage();
-
-
+//
+
-                for (Iterator<ConceptName> i = getNames().iterator(); i.hasNext();) {
-                        ConceptName possibleName = i.next();
@@ -449 +458 @@
-
-        /**
+     * @return the retiredBy
+     */
+    public User getRetiredBy() {
+        return retiredBy;
+    }
+
+        /**
+     * @param retiredBy the retiredBy to set
+     */
+    public void setRetiredBy(User retiredBy) {
+        this.retiredBy = retiredBy;
+    }
+
+        /**
+     * @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;
+    }
+
+        /**
-         * @return Returns the synonyms.
-         */