dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10972
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-05-24 15:40:53 +0700
message:
  renamed programstageinstanceid => eventid in events
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java	2013-05-24 07:24:49 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java	2013-05-24 08:40:53 +0000
@@ -46,7 +46,7 @@
 
     private String programStageId;
 
-    private String programStageInstanceId;
+    private String eventId;
 
     private String organisationUnitId;
 
@@ -92,14 +92,14 @@
 
     @JsonProperty( required = true )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0, isAttribute = true )
-    public String getProgramStageInstanceId()
+    public String getEventId()
     {
-        return programStageInstanceId;
+        return eventId;
     }
 
-    public void setProgramStageInstanceId( String programStageInstanceId )
+    public void setEventId( String eventId )
     {
-        this.programStageInstanceId = programStageInstanceId;
+        this.eventId = eventId;
     }
 
     @JsonProperty
@@ -193,7 +193,7 @@
         return "Event{" +
             "programId='" + programId + '\'' +
             ", programStageId='" + programStageId + '\'' +
-            ", programStageInstanceId='" + programStageInstanceId + '\'' +
+            ", eventId='" + eventId + '\'' +
             ", organisationUnitId='" + organisationUnitId + '\'' +
             ", patientId='" + patientId + '\'' +
             ", eventDate='" + eventDate + '\'' +