dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22041
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10563: Fixed use of deprecated method on spring jdbc template
------------------------------------------------------------
revno: 10563
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-04-15 19:06:42 +0200
message:
Fixed use of deprecated method on spring jdbc template
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/AttributeValueDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/ConfigurationDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitLevelStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserGroupDeletionHandler.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueDeletionHandler.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartStoreTest.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitDataValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitIndicatorValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/JRExportUtils.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/StreamUtils.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-core/src/main/java/org/hisp/dhis/attribute/AttributeValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/AttributeValueDeletionHandler.java 2012-06-04 07:36:11 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/AttributeValueDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -72,7 +72,7 @@
{
String sql = "select count(*) from attributevalue where attributeid=" + attribute.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/ConfigurationDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/ConfigurationDeletionHandler.java 2012-10-04 14:25:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/ConfigurationDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -65,6 +65,6 @@
{
String sql = "SELECT COUNT(*) FROM configuration where feedbackrecipientsid=" + userGroup.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboDeletionHandler.java 2013-02-22 12:26:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -78,7 +78,7 @@
"select cc.categoryoptioncomboid from categoryoptioncombos_categoryoptions cc " +
"where cc.categoryoptionid = " + categoryOption.getId() + " );";
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -91,7 +91,7 @@
"join categories_categoryoptions co on cc.categoryoptionid=co.categoryoptionid " +
"where co.categoryid=" + category.getId() + " );";
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -103,7 +103,7 @@
"select co.categoryoptioncomboid from categorycombos_optioncombos co " +
"where co.categorycomboid=" + categoryCombo.getId() + " );";
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java 2012-07-01 07:12:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -125,6 +125,6 @@
{
String sql = "SELECT COUNT(*) " + "FROM dataelement " + "WHERE optionsetid=" + optionSet.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java 2012-07-01 07:12:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -79,7 +79,7 @@
{
String sql = "SELECT COUNT(*) FROM completedatasetregistration where periodid=" + period.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueDeletionHandler.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -67,7 +67,7 @@
{
String sql = "SELECT COUNT(*) FROM datavalue where dataelementid=" + dataElement.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -75,7 +75,7 @@
{
String sql = "SELECT COUNT(*) FROM datavalue where periodid=" + period.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -83,7 +83,7 @@
{
String sql = "SELECT COUNT(*) FROM datavalue where sourceid=" + unit.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -91,6 +91,6 @@
{
String sql = "SELECT COUNT(*) FROM datavalue where categoryoptioncomboid=" + combo.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java 2013-01-16 10:29:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java 2013-04-15 17:06:42 +0000
@@ -138,7 +138,7 @@
sql += "and um.isread=false ";
}
- return jdbcTemplate.queryForInt( sql );
+ return jdbcTemplate.queryForObject( sql, Integer.class );
}
public long getUnreadUserMessageConversationCount( User user )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitLevelStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitLevelStore.java 2012-04-23 09:49:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitLevelStore.java 2013-04-15 17:06:42 +0000
@@ -67,6 +67,6 @@
{
final String sql = "SELECT MAX(level) FROM orgunitlevel";
- return jdbcTemplate.queryForInt( sql );
+ return jdbcTemplate.queryForObject( sql, Integer.class );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserGroupDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserGroupDeletionHandler.java 2013-03-22 10:47:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserGroupDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -79,7 +79,7 @@
@Override
public String allowDeleteUserGroup( UserGroup group )
{
- int count = jdbcTemplate.queryForInt( "select count(*) from usergroupaccess where usergroupid=" + group.getId() );
+ int count = jdbcTemplate.queryForObject( "select count(*) from usergroupaccess where usergroupid=" + group.getId(), Integer.class );
return count == 0 ? null : "";
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-04-05 04:23:25 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-04-15 17:06:42 +0000
@@ -399,7 +399,7 @@
CalendarPeriodType periodType = (CalendarPeriodType) PeriodType.getPeriodTypeByName( periodTypeName );
String sql = "select periodtypeid from periodtype where name='" + periodTypeName + "'";
- int periodTypeId = jdbcTemplate.queryForInt( sql );
+ int periodTypeId = jdbcTemplate.queryForObject( sql, Integer.class );
Collection<Period> periods = periodType.generatePeriods( startDate, endDate );
@@ -423,7 +423,7 @@
+ periodTypeId + ",'" + start + "','" + end + "' )";
jdbcTemplate.execute( insertSql );
- period.setId( jdbcTemplate.queryForInt( sql ) );
+ period.setId( jdbcTemplate.queryForObject( sql, Integer.class ) );
}
else
{
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2013-04-11 08:30:45 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2013-04-15 17:06:42 +0000
@@ -210,7 +210,7 @@
String sql = "SELECT count(*) FROM patient where lower( " + statementBuilder.getPatientFullName() + ") "
+ "like '%" + fullName + "%' ";
- return jdbcTemplate.queryForInt( sql );
+ return jdbcTemplate.queryForObject( sql, Integer.class );
}
@Override
@@ -328,7 +328,7 @@
public int countSearch( List<String> searchKeys, OrganisationUnit orgunit )
{
String sql = searchPatientSql( true, searchKeys, orgunit, null, null );
- return jdbcTemplate.queryForInt( sql );
+ return jdbcTemplate.queryForObject( sql, Integer.class );
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java 2013-04-11 06:26:56 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java 2013-04-15 17:06:42 +0000
@@ -169,7 +169,7 @@
String sortOrderSql = "SELECT max(sort_order) "
+ "FROM programstageinstance_outboundsms where programstageinstanceid="
+ schedulingProgramObject.getProgramStageInstanceId();
- int sortOrder = jdbcTemplate.queryForInt( sortOrderSql ) + 1;
+ int sortOrder = jdbcTemplate.queryForObject( sortOrderSql, Integer.class ) + 1;
String sql = "INSERT INTO programstageinstance_outboundsms"
+ "( programstageinstanceid, outboundsmsid, sort_order) VALUES " + "("
@@ -208,7 +208,7 @@
String sortOrderSql = "select max(sort_order) "
+ "from programinstance_outboundsms where programinstanceid="
+ schedulingProgramObject.getProgramInstanceId();
- int sortOrder = jdbcTemplate.queryForInt( sortOrderSql ) + 1;
+ int sortOrder = jdbcTemplate.queryForObject( sortOrderSql, Integer.class ) + 1;
String sql = "INSERT INTO programinstance_outboundsms"
+ "( programinstanceid, outboundsmsid, sort_order) VALUES " + "("
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueDeletionHandler.java 2011-12-16 06:45:30 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -68,7 +68,7 @@
{
String sql = "SELECT COUNT(*) FROM patientdatavalue where dataelementid=" + dataElement.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -78,7 +78,7 @@
+ "ON pdv.programstageinstanceid=psi.programstageinstanceid " + "WHERE psi.programstageid="
+ programStage.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java 2012-10-02 08:22:33 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java 2013-04-15 17:06:42 +0000
@@ -65,7 +65,7 @@
{
String sql = "SELECT COUNT(*) FROM programstageinstance WHERE programstageid=" + programStage.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -73,7 +73,7 @@
{
String sql = "SELECT COUNT(*) FROM programstageinstance WHERE programinstanceid=" + programInstance.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
@Override
@@ -81,6 +81,6 @@
{
String sql = "SELECT COUNT(*) FROM programstageinstance psi join programinstance pi on pi.programinstanceid=psi.programinstanceid where pi.programid = " + program.getId();
- return jdbcTemplate.queryForInt( sql ) == 0 ? null : ERROR;
+ return jdbcTemplate.queryForObject( sql, Integer.class ) == 0 ? null : ERROR;
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2013-04-12 08:56:05 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2013-04-15 17:06:42 +0000
@@ -347,7 +347,7 @@
String sql = getTabularReportSql( true, programStage, columns, organisationUnits, level, maxLevel, startDate,
endDate, false, completed, null, null, null );
- return jdbcTemplate.queryForInt( sql );
+ return jdbcTemplate.queryForObject( sql, Integer.class );
}
public void removeEmptyEvents( ProgramStage programStage, OrganisationUnit organisationUnit )
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartStoreTest.java 2013-01-14 21:35:56 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartStoreTest.java 2013-04-15 17:06:42 +0000
@@ -64,7 +64,6 @@
private OrganisationUnit unitA;
private OrganisationUnit unitB;
- private OrganisationUnit unitC;
private Chart chartA;
private Chart chartB;
@@ -131,11 +130,9 @@
unitA = createOrganisationUnit( 'A' );
unitB = createOrganisationUnit( 'B' );
- unitC = createOrganisationUnit( 'C' );
organisationUnitService.addOrganisationUnit( unitA );
organisationUnitService.addOrganisationUnit( unitB );
- // organisationUnitService.addOrganisationUnit( unitC );
List<OrganisationUnit> units = new ArrayList<OrganisationUnit>();
units.add( unitA );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java 2013-03-14 10:12:47 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java 2013-04-15 17:06:42 +0000
@@ -125,7 +125,7 @@
indicatorService.addIndicatorType( indicatorType );
- periodType = MonthlyPeriodType.getPeriodTypeByName( MonthlyPeriodType.NAME );
+ periodType = PeriodType.getPeriodTypeByName( MonthlyPeriodType.NAME );
dataElementA = createDataElement( 'A' );
dataElementB = createDataElement( 'B' );
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitDataValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitDataValueRowMapper.java 2012-02-29 12:26:39 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitDataValueRowMapper.java 2013-04-15 17:06:42 +0000
@@ -30,7 +30,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.amplecode.quick.mapper.RowMapper;
import org.hisp.dhis.aggregation.AggregatedDataValue;
/**
@@ -38,7 +37,6 @@
*/
public class AggregatedOrgUnitDataValueRowMapper
extends AggregatedDataValueRowMapper
- implements RowMapper<AggregatedDataValue>, org.springframework.jdbc.core.RowMapper<AggregatedDataValue>
{
@Override
public AggregatedDataValue mapRow( ResultSet resultSet )
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitIndicatorValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitIndicatorValueRowMapper.java 2012-02-29 12:26:39 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitIndicatorValueRowMapper.java 2013-04-15 17:06:42 +0000
@@ -30,7 +30,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.amplecode.quick.mapper.RowMapper;
import org.hisp.dhis.aggregation.AggregatedIndicatorValue;
/**
@@ -38,7 +37,6 @@
*/
public class AggregatedOrgUnitIndicatorValueRowMapper
extends AggregatedIndicatorValueRowMapper
- implements RowMapper<AggregatedIndicatorValue>, org.springframework.jdbc.core.RowMapper<AggregatedIndicatorValue>
{
@Override
public AggregatedIndicatorValue mapRow( ResultSet resultSet )
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/JRExportUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/JRExportUtils.java 2012-10-14 14:39:23 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/JRExportUtils.java 2013-04-15 17:06:42 +0000
@@ -38,8 +38,8 @@
import net.sf.jasperreports.engine.export.JRHtmlExporter;
import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
import net.sf.jasperreports.engine.export.JRPdfExporter;
+import net.sf.jasperreports.engine.export.JRXlsAbstractExporterParameter;
import net.sf.jasperreports.engine.export.JRXlsExporter;
-import net.sf.jasperreports.engine.export.JRXlsExporterParameter;
/**
* Supports PDF and XLS exports.
@@ -84,12 +84,12 @@
public JRAbstractExporter provide()
{
JRXlsExporter exporter = new JRXlsExporter();
- exporter.setParameter( JRXlsExporterParameter.IS_DETECT_CELL_TYPE, Boolean.TRUE );
- exporter.setParameter( JRXlsExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS, Boolean.TRUE );
- exporter.setParameter( JRXlsExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_COLUMNS, Boolean.TRUE );
- exporter.setParameter( JRXlsExporterParameter.IS_COLLAPSE_ROW_SPAN, Boolean.TRUE );
- exporter.setParameter( JRXlsExporterParameter.IS_IGNORE_CELL_BORDER, Boolean.TRUE );
- exporter.setParameter( JRXlsExporterParameter.IS_WHITE_PAGE_BACKGROUND, Boolean.FALSE );
+ exporter.setParameter( JRXlsAbstractExporterParameter.IS_DETECT_CELL_TYPE, Boolean.TRUE );
+ exporter.setParameter( JRXlsAbstractExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS, Boolean.TRUE );
+ exporter.setParameter( JRXlsAbstractExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_COLUMNS, Boolean.TRUE );
+ exporter.setParameter( JRXlsAbstractExporterParameter.IS_COLLAPSE_ROW_SPAN, Boolean.TRUE );
+ exporter.setParameter( JRXlsAbstractExporterParameter.IS_IGNORE_CELL_BORDER, Boolean.TRUE );
+ exporter.setParameter( JRXlsAbstractExporterParameter.IS_WHITE_PAGE_BACKGROUND, Boolean.FALSE );
return exporter;
}
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/StreamUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/StreamUtils.java 2013-01-23 13:40:54 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/StreamUtils.java 2013-04-15 17:06:42 +0000
@@ -125,8 +125,7 @@
{
closeInputStream( in );
closeOutputStream( out );
- }
-
+ }
}
/**
