dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10774
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-07 09:43:44 +0200
message:
  Minor rename
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml


--
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/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<String> filters = new ArrayList<String>();
+    private List<String> filterDimensions = new ArrayList<String>();
 
     private boolean hideLegend;
 
@@ -180,14 +180,14 @@
 
     public NameableObject filter()
     {
-        List<NameableObject> list = dimensionToList( filters.get( 0 ) ); //TODO
+        List<NameableObject> 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<String> getFilters()
+    public List<String> getFilterDimensions()
     {
-        return filters;
+        return filterDimensions;
     }
 
-    public void setFilters( List<String> filters )
+    public void setFilterDimensions( List<String> 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 @@
 
     <property name="category" />
 
-    <list name="filters" table="chart_filters">
+    <list name="filterDimensions" table="chart_filters">
       <cache usage="read-write" />
       <key column="chartid" />
       <list-index column="sort_order" base="0" />