dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19047
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-04-28 18:02:18 +0200
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.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-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java	2015-04-28 13:03:32 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java	2015-04-28 16:02:18 +0000
@@ -54,16 +54,16 @@
     extends BaseIdentifiableObject
 {
     /**
+     * The description of the program rule
+     */
+    private String description;
+    
+    /**
      * The program that the rule belongs to
      */
     private Program program;
     
     /**
-     * The program that the rule belongs to
-     */
-    private String description;
-    
-    /**
      * The programStage that the rule belongs to
      */
     private ProgramStage programStage;
@@ -98,7 +98,7 @@
     {
         this();
         this.name = name;
-        this.setDescription( description );
+        this.description = description;
         this.program = program;
         this.programStage = programStage;
         this.programRuleActions = programRuleActions;
@@ -111,6 +111,18 @@
     // -------------------------------------------------------------------------
 
     @JsonProperty
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription( String description )
+    {
+        this.description = description;
+    }
+    
+    @JsonProperty
     @JsonSerialize( as = BaseIdentifiableObject.class )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public Program getProgram()
@@ -173,18 +185,6 @@
         this.priority = priority;
     }
 
-    @JsonProperty
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-    public String getDescription()
-    {
-        return description;
-    }
-
-    public void setDescription( String description )
-    {
-        this.description = description;
-    }
-    
     @Override
     public void mergeWith( IdentifiableObject other, MergeStrategy strategy )
     {