=== 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 2011-04-18 12:33:30 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2011-04-18 13:03:42 +0000 @@ -524,14 +524,14 @@ return multiplePieChart; } + else if ( chart.isType( TYPE_BAR3D ) ) + { + plot = new CategoryPlot( dataSets[0], new CategoryAxis(), new NumberAxis(), bar3dRenderer ); + } else if ( chart.isType( TYPE_BAR ) ) { plot = new CategoryPlot( dataSets[0], new CategoryAxis(), new NumberAxis(), barRenderer ); } - else if ( chart.isType( TYPE_BAR3D ) ) - { - plot = new CategoryPlot( dataSets[0], new CategoryAxis(), new NumberAxis(), bar3dRenderer ); - } if ( chart.isRegression() ) { === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartServiceTest.java' --- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartServiceTest.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartServiceTest.java 2011-04-18 13:03:42 +0000 @@ -147,8 +147,13 @@ units.add( unitC ); chartA = createChart( 'A', indicators, periods, units ); + chartA.setType( Chart.TYPE_BAR ); + chartB = createChart( 'B', indicators, periods, units ); + chartB.setType( Chart.TYPE_BAR ); + chartC = createChart( 'C', indicators, periods, units ); + chartC.setType( Chart.TYPE_BAR ); } // -------------------------------------------------------------------------