dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10971
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-05-24 14:38:03 +0700
message:
  removed id property of events, added programId / programInstanceId (will be used for multiple events with registration)
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Events.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/Events.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Events.java	2013-05-18 10:19:44 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Events.java	2013-05-24 07:38:03 +0000
@@ -42,7 +42,9 @@
 @JacksonXmlRootElement( localName = "events", namespace = DxfNamespaces.DXF_2_0 )
 public class Events
 {
-    private String id;
+    private String programId;
+
+    private String programInstanceId;
 
     private List<Event> events = new ArrayList<Event>();
 
@@ -52,14 +54,26 @@
 
     @JsonProperty
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0, isAttribute = true )
-    public String getId()
-    {
-        return id;
-    }
-
-    public void setId( String id )
-    {
-        this.id = id;
+    public String getProgramId()
+    {
+        return programId;
+    }
+
+    public void setProgramId( String programId )
+    {
+        this.programId = programId;
+    }
+
+    @JsonProperty
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0, isAttribute = true )
+    public String getProgramInstanceId()
+    {
+        return programInstanceId;
+    }
+
+    public void setProgramInstanceId( String programInstanceId )
+    {
+        this.programInstanceId = programInstanceId;
     }
 
     @JsonProperty( "eventList" )
@@ -79,7 +93,8 @@
     public String toString()
     {
         return "Events{" +
-            "id='" + id + '\'' +
+            "programId='" + programId + '\'' +
+            ", programInstanceId='" + programInstanceId + '\'' +
             ", events=" + events +
             '}';
     }