dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21328
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-12-04 19:01:10 +0700
message:
  various fixes to metadata class
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2015-11-30 03:36:54 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2015-12-04 12:01:10 +0000
@@ -84,6 +84,7 @@
 import org.hisp.dhis.program.ProgramStage;
 import org.hisp.dhis.program.ProgramStageDataElement;
 import org.hisp.dhis.program.ProgramStageSection;
+import org.hisp.dhis.program.ProgramTrackedEntityAttribute;
 import org.hisp.dhis.program.ProgramValidation;
 import org.hisp.dhis.programrule.ProgramRule;
 import org.hisp.dhis.programrule.ProgramRuleAction;
@@ -232,6 +233,8 @@
 
     private List<ProgramStageSection> programStageSections = new ArrayList<>();
 
+    private List<ProgramTrackedEntityAttribute> programTrackedEntityAttributes = new ArrayList<>();
+
     private List<RelationshipType> relationshipTypes = new ArrayList<>();
 
     private List<ValidationCriteria> validationCriterias = new ArrayList<>();
@@ -312,7 +315,7 @@
     @JsonProperty
     @JacksonXmlElementWrapper( localName = "dataApprovalWorkflows", namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "dataApprovalWorkflow", namespace = DxfNamespaces.DXF_2_0 )
-    public List<DataApprovalWorkflow> getdataApprovalWorkflows()
+    public List<DataApprovalWorkflow> getDataApprovalWorkflows()
     {
         return dataApprovalWorkflows;
     }
@@ -960,6 +963,19 @@
     }
 
     @JsonProperty
+    @JacksonXmlElementWrapper( localName = "programTrackedEntityAttributes", namespace = DxfNamespaces.DXF_2_0 )
+    @JacksonXmlProperty( localName = "programTrackedEntityAttribute", namespace = DxfNamespaces.DXF_2_0 )
+    public List<ProgramTrackedEntityAttribute> getProgramTrackedEntityAttributes()
+    {
+        return programTrackedEntityAttributes;
+    }
+
+    public void setProgramTrackedEntityAttributes( List<ProgramTrackedEntityAttribute> programTrackedEntityAttributes )
+    {
+        this.programTrackedEntityAttributes = programTrackedEntityAttributes;
+    }
+
+    @JsonProperty
     @JacksonXmlElementWrapper( localName = "relationshipTypes", namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "relationshipType", namespace = DxfNamespaces.DXF_2_0 )
     public List<RelationshipType> getRelationshipTypes()