=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Person.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Person.java 2013-09-06 09:34:21 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Person.java 2013-09-06 10:06:11 +0000 @@ -39,7 +39,7 @@ @JacksonXmlRootElement( localName = "person", namespace = DxfNamespaces.DXF_2_0 ) public class Person { - private String patient; + private String person; public Person() { @@ -47,14 +47,14 @@ @JsonProperty( required = true ) @JacksonXmlProperty( isAttribute = true ) - public String getPatient() + public String getPerson() { - return patient; + return person; } - public void setPatient( String patient ) + public void setPerson( String person ) { - this.patient = patient; + this.person = person; } @Override @@ -65,7 +65,7 @@ Person person = (Person) o; - if ( patient != null ? !patient.equals( person.patient ) : person.patient != null ) return false; + if ( person != null ? !person.equals( person.person ) : person.person != null ) return false; return true; } @@ -73,14 +73,14 @@ @Override public int hashCode() { - return patient != null ? patient.hashCode() : 0; + return person != null ? person.hashCode() : 0; } @Override public String toString() { return "Person{" + - "patient='" + patient + '\'' + + "person='" + person + '\'' + '}'; } }