← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10725: Renamed getTitle to generateTitle in Chart

 

------------------------------------------------------------
revno: 10725
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-04-30 14:40:20 +0200
message:
  Renamed getTitle to generateTitle in Chart
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.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/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2013-03-25 23:23:06 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2013-04-30 12:40:20 +0000
@@ -185,7 +185,7 @@
         return list != null && !list.isEmpty() ? list.iterator().next() : null;
     }
 
-    public String getTitle()
+    public String generateTitle()
     {
         if ( DIMENSION_PERIOD.equals( filter ) )
         {

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2013-04-24 14:11:57 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2013-04-30 12:40:20 +0000
@@ -278,7 +278,7 @@
         chart.setRelativePeriods( periods );
         chart.setOrganisationUnits( organisationUnits );
         chart.setFormat( format );
-        chart.setName( chart.getTitle() );
+        chart.setName( chart.generateTitle() );
 
         return getJFreeChart( chart, false );
     }
@@ -720,7 +720,7 @@
         TextTitle title = new TextTitle();
 
         title.setFont( subTitleFont );
-        title.setText( chart.getTitle() );
+        title.setText( chart.generateTitle() );
 
         return title;
     }