dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09297
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2424: Removed unused code
------------------------------------------------------------
revno: 2424
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2010-12-25 17:43:02 +0100
message:
Removed unused code
removed:
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/WorkbookServiceTest.java
renamed:
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/tallysheet/ => dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/tallysheet/
modified:
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionServiceTest.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/tallysheet/TallySheetServiceTest.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CsvUtils.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.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-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java 2010-12-25 14:36:08 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java 2010-12-25 16:43:02 +0000
@@ -134,7 +134,7 @@
Collection<OrganisationUnit> subTree = organisationUnitService.getOrganisationUnitWithChildren( unit.getId() );
- for ( OrganisationUnitGroup group : groups ) // Columns
+ for ( OrganisationUnitGroup group : groups )
{
Collection<OrganisationUnit> result = CollectionUtils.intersection( subTree, group.getMembers() );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java 2010-12-25 16:43:02 +0000
@@ -48,12 +48,6 @@
String writeReportTableData( OutputStream outputStream, int id, I18nFormat format );
- void writeAllDataElements( OutputStream outputStream, I18n i18n );
-
- void writeAllIndicators( OutputStream outputStream, I18n i18n );
-
- void writeAllOrganisationUnits( OutputStream outputStream, I18n i18n );
-
void writeDataSetCompletenessResult( Collection<DataSetCompletenessResult> results, OutputStream out, I18n i18n, OrganisationUnit unit, DataSet dataSet );
void writeValidationResult( List<ValidationResult> results, OutputStream out, I18n i18n, I18nFormat format );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java 2010-12-25 16:43:02 +0000
@@ -32,9 +32,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.SortedMap;
import jxl.Workbook;
@@ -48,15 +46,10 @@
import jxl.write.biff.RowsExceededException;
import org.hisp.dhis.completeness.DataSetCompletenessResult;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.reporttable.ReportTableData;
import org.hisp.dhis.reporttable.ReportTableService;
@@ -84,27 +77,6 @@
this.reportTableService = reportTableService;
}
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
// -------------------------------------------------------------------------
// Properties
// -------------------------------------------------------------------------
@@ -178,154 +150,6 @@
return data.getName();
}
- public void writeAllDataElements( OutputStream outputStream, I18n i18n )
- {
- try
- {
- WritableWorkbook workbook = Workbook.createWorkbook( outputStream );
-
- WritableSheet sheet = workbook.createSheet( "Data elements", 0 );
-
- int rowNumber = 1;
-
- for ( DataElement element : dataElementService.getAllDataElements() )
- {
- sheet.addCell( new Label( 0, rowNumber++, element.getName(), FORMAT_TTTLE ) );
-
- rowNumber++;
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "alternative_name" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, element.getAlternativeName(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "short_name" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, element.getShortName(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "code" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, element.getCode(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "description" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, element.getDescription(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "active" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, getBoolean().get( element.isActive() ), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "type" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, getType().get( element.getType() ), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "aggregation_operator" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, getAggregationOperator().get(
- element.getAggregationOperator() ), FORMAT_TEXT ) );
-
- rowNumber++;
- }
-
- workbook.write();
-
- workbook.close();
- }
- catch ( Exception ex )
- {
- throw new RuntimeException( "Failed to generate workbook for data elements", ex );
- }
- }
-
- public void writeAllIndicators( OutputStream outputStream, I18n i18n )
- {
- try
- {
- WritableWorkbook workbook = Workbook.createWorkbook( outputStream );
-
- WritableSheet sheet = workbook.createSheet( "Indicators", 0 );
-
- int rowNumber = 1;
-
- for ( Indicator indicator : indicatorService.getAllIndicators() )
- {
- sheet.addCell( new Label( 0, rowNumber++, indicator.getName(), FORMAT_TTTLE ) );
-
- rowNumber++;
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "alternative_name" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, indicator.getAlternativeName(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "short_name" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, indicator.getShortName(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "code" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, indicator.getCode(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "description" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, indicator.getDescription(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "annualized" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, getBoolean().get( indicator.getAnnualized() ), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "indicator_type" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, indicator.getIndicatorType().getName(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "numerator_description" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, indicator.getNumeratorDescription(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "denominator_description" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, indicator.getDenominatorDescription(), FORMAT_TEXT ) );
-
- rowNumber++;
- }
-
- workbook.write();
-
- workbook.close();
- }
- catch ( Exception ex )
- {
- throw new RuntimeException( "Failed to generate workbook for indicators", ex );
- }
- }
-
- public void writeAllOrganisationUnits( OutputStream outputStream, I18n i18n )
- {
- try
- {
- WritableWorkbook workbook = Workbook.createWorkbook( outputStream );
-
- WritableSheet sheet = workbook.createSheet( "Organisation units", 0 );
-
- int rowNumber = 1;
-
- for ( OrganisationUnit unit : organisationUnitService.getAllOrganisationUnits() )
- {
- sheet.addCell( new Label( 0, rowNumber++, unit.getName(), FORMAT_TTTLE ) );
-
- rowNumber++;
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "short_name" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, unit.getShortName(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "code" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, unit.getCode(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "active" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, getBoolean().get( unit.isActive() ), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "comment" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, unit.getComment(), FORMAT_TEXT ) );
-
- sheet.addCell( new Label( 0, rowNumber, i18n.getString( "geo_code" ), FORMAT_LABEL ) );
- sheet.addCell( new Label( 1, rowNumber++, unit.getGeoCode(), FORMAT_TEXT ) );
-
- rowNumber++;
- }
-
- workbook.write();
-
- workbook.close();
- }
- catch ( Exception ex )
- {
- throw new RuntimeException( "Failed to generate workbook for organisation units", ex );
- }
- }
-
public void writeDataSetCompletenessResult( Collection<DataSetCompletenessResult> results, OutputStream out,
I18n i18n, OrganisationUnit unit, DataSet dataSet )
{
@@ -475,34 +299,4 @@
throw new RuntimeException( "Write failed", ex );
}
}
-
- // -------------------------------------------------------------------------
- // Supportive methods
- // -------------------------------------------------------------------------
-
- private Map<Boolean, String> getBoolean()
- {
- Map<Boolean, String> map = new HashMap<Boolean, String>();
- map.put( true, "Yes" );
- map.put( false, "No" );
- return map;
- }
-
- private Map<String, String> getType()
- {
- Map<String, String> map = new HashMap<String, String>();
- map.put( DataElement.VALUE_TYPE_STRING, "Text" );
- map.put( DataElement.VALUE_TYPE_INT, "Number" );
- map.put( DataElement.VALUE_TYPE_BOOL, "Yes/No" );
- return map;
- }
-
- private Map<String, String> getAggregationOperator()
- {
- Map<String, String> map = new HashMap<String, String>();
- map.put( DataElement.AGGREGATION_OPERATOR_SUM, "Sum" );
- map.put( DataElement.AGGREGATION_OPERATOR_AVERAGE, "Average" );
- map.put( DataElement.AGGREGATION_OPERATOR_COUNT, "Count" );
- return map;
- }
}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-12-14 11:36:39 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-12-25 16:43:02 +0000
@@ -207,13 +207,7 @@
<bean id="org.hisp.dhis.workbook.WorkbookService"
class="org.hisp.dhis.workbook.impl.JExcelWorkbookService">
<property name="reportTableService"
- ref="org.hisp.dhis.reporttable.ReportTableService"/>
- <property name="dataElementService"
- ref="org.hisp.dhis.dataelement.DataElementService"/>
- <property name="indicatorService"
- ref="org.hisp.dhis.indicator.IndicatorService"/>
- <property name="organisationUnitService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ ref="org.hisp.dhis.reporttable.ReportTableService"/>
</bean>
<!-- PivotTable -->
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionServiceTest.java 2010-12-14 11:36:39 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionServiceTest.java 2010-12-25 16:43:02 +0000
@@ -62,6 +62,6 @@
Grid grid = distributionService.getOrganisationUnitDistribution( groupSet, unitA, false );
assertNotNull( grid );
assertEquals( 3, grid.getWidth() );
- assertEquals( 3, grid.getHeight() );
+ assertEquals( 2, grid.getHeight() );
}
}
=== renamed directory 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/tallysheet' => 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/tallysheet'
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/tallysheet/TallySheetServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/tallysheet/TallySheetServiceTest.java 2010-06-03 08:06:09 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/tallysheet/TallySheetServiceTest.java 2010-12-25 16:43:02 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.workbook.tallysheet;
+package org.hisp.dhis.tallysheet;
/*
* Copyright (c) 2004-2010, University of Oslo
=== removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook'
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/WorkbookServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/WorkbookServiceTest.java 2010-11-12 17:52:09 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/workbook/WorkbookServiceTest.java 1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-package org.hisp.dhis.workbook;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.hisp.dhis.DhisTest;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.IndicatorType;
-import org.hisp.dhis.mock.MockI18n;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.system.util.StreamUtils;
-import org.junit.Test;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class WorkbookServiceTest
- extends DhisTest
-{
- private WorkbookService workbookService;
-
- private DataElementService dataElementService;
-
- private IndicatorService indicatorService;
-
- private OrganisationUnitService organisationUnitService;
-
- private I18n i18n;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- {
- i18n = new MockI18n();
-
- workbookService = (WorkbookService) getBean( WorkbookService.ID );
-
- dataElementService = (DataElementService) getBean( DataElementService.ID );
-
- indicatorService = (IndicatorService) getBean( IndicatorService.ID );
-
- organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
-
- dataElementService.addDataElement( createDataElement( 'A' ) );
- dataElementService.addDataElement( createDataElement( 'B' ) );
- dataElementService.addDataElement( createDataElement( 'C' ) );
-
- IndicatorType indicatorType = createIndicatorType( 'A' );
- indicatorService.addIndicatorType( indicatorType );
-
- indicatorService.addIndicator( createIndicator( 'A', indicatorType ) );
- indicatorService.addIndicator( createIndicator( 'B', indicatorType ) );
- indicatorService.addIndicator( createIndicator( 'C', indicatorType ) );
-
- organisationUnitService.addOrganisationUnit( createOrganisationUnit( 'A' ) );
- organisationUnitService.addOrganisationUnit( createOrganisationUnit( 'B' ) );
- organisationUnitService.addOrganisationUnit( createOrganisationUnit( 'C' ) );
- }
-
- @Override
- public boolean emptyDatabaseAfterTest()
- {
- return true;
- }
-
- // -------------------------------------------------------------------------
- // Tests
- // -------------------------------------------------------------------------
-
- @Test
- public void testWriteAllDataElements()
- throws Exception
- {
- OutputStream outputStream = new ByteArrayOutputStream();
-
- workbookService.writeAllDataElements( outputStream, i18n );
-
- assertNotNull( outputStream );
-
- StreamUtils.closeOutputStream( outputStream );
- }
-
- @Test
- public void testWriteAllIndicators()
- throws Exception
- {
- OutputStream outputStream = new ByteArrayOutputStream();
-
- workbookService.writeAllIndicators( outputStream, i18n );
-
- assertNotNull( outputStream );
-
- StreamUtils.closeOutputStream( outputStream );
- }
-
- @Test
- public void testWriteAllOrganisationUnits()
- throws Exception
- {
- OutputStream outputStream = new ByteArrayOutputStream();
-
- workbookService.writeAllOrganisationUnits( outputStream, i18n );
-
- assertNotNull( outputStream );
-
- StreamUtils.closeOutputStream( outputStream );
- }
-}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CsvUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CsvUtils.java 2010-12-25 13:24:54 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CsvUtils.java 2010-12-25 16:43:02 +0000
@@ -42,7 +42,8 @@
private static final String EMPTY = "";
/**
- * Encodes the given value to a CSV acceptable value.
+ * Encodes the given value to a CSV acceptable value. Returns the empty string
+ * if argument is null.
*
* @param value the value.
* @return the CSV encoded value.
@@ -53,7 +54,8 @@
}
/**
- * Encodes the given value to a CSV acceptable value.
+ * Encodes the given value to a CSV acceptable value. Returns the empty string
+ * if argument is null.
*
* @param value the value.
* @return the CSV encoded value.
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2010-11-12 17:58:03 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2010-12-25 16:43:02 +0000
@@ -63,9 +63,6 @@
//
// -------------------------------------------------------------------------
- /**
- * @throws WriteException
- */
public static void setUpFormat( WritableCellFormat cellFormat, Alignment alignment, Border border,
BorderLineStyle borderLineStyle, Colour colour )
throws WriteException
@@ -75,10 +72,6 @@
cellFormat.setBorder( border, borderLineStyle );
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
public static void printDataElementHeaders( WritableSheet sheet, WritableCellFormat format, I18n i18n, int row,
int column )
throws RowsExceededException, WriteException
@@ -93,11 +86,6 @@
sheet.addCell( new Label( column++, row, i18n.getString( "aggregation_operator" ), format ) );
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
-
public static void addDataElementCellToSheet( WritableSheet sheet, WritableCellFormat format, DataElement element,
I18n i18n, int row, int column )
throws RowsExceededException, WriteException
@@ -113,10 +101,6 @@
format ) );
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
public static void printIndicatorHeaders( WritableSheet sheet, WritableCellFormat format, I18n i18n, int row,
int column )
throws RowsExceededException, WriteException
@@ -137,11 +121,6 @@
}
- /**
- * @param expressionService
- * @throws WriteException
- * @throws RowsExceededException
- */
public static void addIndicatorCellToSheet( WritableSheet sheet, WritableCellFormat format, Indicator indicator,
I18n i18n, ExpressionService expressionService, int row, int column )
throws RowsExceededException, WriteException
@@ -167,10 +146,6 @@
.getExpressionDescription( indicator.getDenominator() ), format ) );
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
public static void printExtendedDataElementHeaders( WritableSheet sheet, WritableCellFormat format1,
WritableCellFormat format2, I18n i18n, int row, int column )
throws RowsExceededException, WriteException
@@ -239,11 +214,6 @@
sheet.addCell( new Label( column++, row, i18n.getString( "last_updated" ), format2 ) );
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
-
public static void addExtendedDataElementCellToSheet( WritableSheet sheet, WritableCellFormat format,
DataElement element, I18n i18n, int row, int column )
throws RowsExceededException, WriteException
@@ -304,11 +274,6 @@
}
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
-
public static void printOrganisationUnitHeaders( WritableSheet sheet, WritableCellFormat format, I18n i18n,
int row, int column )
throws RowsExceededException, WriteException
@@ -322,11 +287,6 @@
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
-
public static void addOrganisationUnitCellToSheet( WritableSheet sheet, WritableCellFormat format,
OrganisationUnit unit, I18n i18n, I18nFormat i18nFormat, int row, int column )
throws RowsExceededException, WriteException
@@ -341,11 +301,6 @@
sheet.addCell( new Label( column++, row, unit.getComment(), format ) );
}
- /**
- * @throws WriteException
- * @throws RowsExceededException
- */
-
public static void printOrganisationUnitHierarchyHeaders( WritableSheet sheet, WritableCellFormat format1,
WritableCellFormat format2, I18n i18n, int row, int column, int level )
throws RowsExceededException, WriteException
