← Back to branch summary

~stian-sandvold/dhis2/AnalyticsByUser

« back to all changes in this revision

Viewing changes to dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java

  • Committer: Stian Sandvold
  • Date: 2016-08-03 09:05:19 UTC
  • mfrom: (23568.1.32 dhis2)
  • Revision ID: stian.sandvold@gmail.com-20160803090519-sw34m18dzycv2amz
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java
29
29
 */
30
30
 
31
31
import com.fasterxml.jackson.annotation.JsonProperty;
32
 
import com.fasterxml.jackson.annotation.JsonView;
33
32
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
34
33
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
35
34
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
41
40
import org.hisp.dhis.common.IdentifiableObject;
42
41
import org.hisp.dhis.common.MergeMode;
43
42
import org.hisp.dhis.common.annotation.Scanned;
44
 
import org.hisp.dhis.common.view.DetailedView;
45
 
import org.hisp.dhis.common.view.ExportView;
46
43
 
47
44
import java.util.ArrayList;
48
45
import java.util.HashSet;
107
104
    // -------------------------------------------------------------------------
108
105
 
109
106
    @JsonProperty( "isDefault" )
110
 
    @JsonView( { DetailedView.class } )
111
107
    public boolean isDefault()
112
108
    {
113
109
        return DEFAULT_CATEGORY_COMBO_NAME.equals( name );
277
273
 
278
274
    @JsonProperty
279
275
    @JsonSerialize( contentAs = BaseIdentifiableObject.class )
280
 
    @JsonView( { DetailedView.class, ExportView.class } )
281
276
    @JacksonXmlElementWrapper( localName = "categories", namespace = DxfNamespaces.DXF_2_0 )
282
277
    @JacksonXmlProperty( localName = "category", namespace = DxfNamespaces.DXF_2_0 )
283
278
    public List<DataElementCategory> getCategories()
292
287
 
293
288
    @JsonProperty( "categoryOptionCombos" )
294
289
    @JsonSerialize( contentAs = BaseIdentifiableObject.class )
295
 
    @JsonView( { DetailedView.class } )
296
290
    @JacksonXmlElementWrapper( localName = "categoryOptionCombos", namespace = DxfNamespaces.DXF_2_0 )
297
291
    @JacksonXmlProperty( localName = "categoryOptionCombo", namespace = DxfNamespaces.DXF_2_0 )
298
292
    public Set<DataElementCategoryOptionCombo> getOptionCombos()
306
300
    }
307
301
 
308
302
    @JsonProperty
309
 
    @JsonView( { DetailedView.class, ExportView.class } )
310
303
    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
311
304
    public DataDimensionType getDataDimensionType()
312
305
    {
319
312
    }
320
313
 
321
314
    @JsonProperty
322
 
    @JsonView( { DetailedView.class, ExportView.class } )
323
315
    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
324
316
    public boolean isSkipTotal()
325
317
    {