=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2010-12-10 19:33:05 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2010-12-10 22:00:25 +0000 @@ -75,7 +75,6 @@ { private static final Log log = LogFactory.getLog( DefaultReportTableService.class ); - private static final String NULL_REPLACEMENT = "0.0"; private static final String MODE_REPORT = "report"; private static final String MODE_REPORT_TABLE = "table"; @@ -499,7 +498,7 @@ for ( String identifier : reportTable.getCrossTabIdentifiers() ) { - grid.addValue( parseAndReplaceNull( map.get( identifier ) ) ); + grid.addValue( valueOf( map.get( identifier ) ) ); } // ----------------------------------------------------- @@ -510,11 +509,11 @@ { for ( DimensionOption dimensionOption : reportTable.getDimensionOptions() ) { - grid.addValue( String.valueOf( aggregatedDataValueService. + grid.addValue( valueOf( aggregatedDataValueService. getAggregatedValue( (DataElement) metaObject, dimensionOption, period, unit ) ) ); } - grid.addValue( String.valueOf( aggregatedDataValueService.getAggregatedValue( (DataElement) metaObject, period, unit ) ) ); + grid.addValue( valueOf( aggregatedDataValueService.getAggregatedValue( (DataElement) metaObject, period, unit ) ) ); } } } @@ -525,14 +524,14 @@ } /** - * Converts the given Double to String or replaces with default value if null. + * Converts the given Double to String. * * @param value the Double. * @return the String. */ - private String parseAndReplaceNull( Double value ) + private String valueOf( Double value ) { - return value != null ? String.valueOf( value ) : NULL_REPLACEMENT; + return value != null ? String.valueOf( value ) : null; } /**