=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2013-05-05 18:08:08 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2013-05-07 07:43:44 +0000 @@ -98,7 +98,7 @@ private String category; - private List filters = new ArrayList(); + private List filterDimensions = new ArrayList(); private boolean hideLegend; @@ -180,14 +180,14 @@ public NameableObject filter() { - List list = dimensionToList( filters.get( 0 ) ); //TODO + List list = dimensionToList( filterDimensions.get( 0 ) ); //TODO return list != null && !list.isEmpty() ? list.iterator().next() : null; } public String generateTitle() { - if ( DIMENSION_PERIOD.equals( filters.get( 0 ) ) ) + if ( DIMENSION_PERIOD.equals( filterDimensions.get( 0 ) ) ) { return format.formatPeriod( getAllPeriods().get( 0 ) ); } @@ -316,8 +316,8 @@ { this.series = series; this.category = category; - this.filters.clear(); - this.filters.add( filter ); //TODO + this.filterDimensions.clear(); + this.filterDimensions.add( filter ); //TODO } public boolean hasIndicators() @@ -439,14 +439,14 @@ this.category = category; } - public List getFilters() + public List getFilterDimensions() { - return filters; + return filterDimensions; } - public void setFilters( List filters ) + public void setFilterDimensions( List filterDimensions ) { - this.filters = filters; + this.filterDimensions = filterDimensions; } @JsonProperty @@ -454,13 +454,13 @@ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0) public String getFilter() { - return filters.get( 0 ); //TODO + return filterDimensions.get( 0 ); //TODO } public void setFilter( String filter ) { - this.filters.clear(); - this.filters.add( filter ); //TODO + this.filterDimensions.clear(); + this.filterDimensions.add( filter ); //TODO } @JsonProperty === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml' --- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2013-05-05 18:08:08 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2013-05-07 07:43:44 +0000 @@ -32,7 +32,7 @@ - +