=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2013-12-30 09:44:58 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2014-02-11 18:19:02 +0000 @@ -66,8 +66,6 @@ */ private static final long serialVersionUID = -2118690320625221749L; - private String description; - private Boolean compulsory = false; @Scanned @@ -219,19 +217,6 @@ @JsonProperty @JsonView({ DetailedView.class, ExportView.class }) @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0) - public String getDescription() - { - return description; - } - - public void setDescription( String description ) - { - this.description = description; - } - - @JsonProperty - @JsonView({ DetailedView.class, ExportView.class }) - @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0) public Boolean isCompulsory() { if ( compulsory == null ) === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java 2014-02-03 04:18:08 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java 2014-02-11 18:19:02 +0000 @@ -69,8 +69,6 @@ private static final Comparator COMPARATOR = new IdentifiableObjectNameComparator(); - private String description; - private boolean compulsory; @Scanned @@ -223,19 +221,6 @@ @JsonProperty @JsonView( { DetailedView.class, ExportView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public String getDescription() - { - return description; - } - - public void setDescription( String description ) - { - this.description = description; - } - - @JsonProperty - @JsonView( { DetailedView.class, ExportView.class } ) - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public boolean isCompulsory() { return compulsory;