OpenMRS

Timestamp:

07/02/08 19:40:36 (5 months ago)

Author:

bmckown

Message:

Merging trunk to complex-obs [4379][4764]

Files:

• openmrs/branches/complex-obs/src/api/org/openmrs/PersonAttribute.java (modified) (2 diffs)

openmrs/branches/complex-obs/src/api/org/openmrs/PersonAttribute.java

@@ -129 +129 @@
-        }
-        
+        /**
+         * @see java.lang.Object#hashCode()
+         */
-        public int hashCode() {
-                if (this.getPersonAttributeId() == null) return super.hashCode();
@@ -366 +369 @@
-         * @see java.lang.Object#toString()
-         */
-
+
+
-                Object o = getHydratedObject();
-                if (o instanceof Attributable)