=== removed file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java 1970-01-01 00:00:00 +0000 @@ -1,62 +0,0 @@ -package org.hisp.dhis.system.objectmapper; - -/* - * Copyright (c) 2004-2012, 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 java.sql.ResultSet; -import java.sql.SQLException; - -import org.amplecode.quick.mapper.RowMapper; -import org.hisp.dhis.aggregation.AggregatedMapValue; - -/** - * @author Jan Henrik Overland - * @version $Id$ - */ -public class AggregatedDataMapValueRowMapper - implements RowMapper, org.springframework.jdbc.core.RowMapper -{ - public AggregatedMapValue mapRow( ResultSet resultSet ) - throws SQLException - { - final AggregatedMapValue value = new AggregatedMapValue(); - - value.setPeriodId( resultSet.getInt( "periodid" ) ); - value.setOrganisationUnitId( resultSet.getInt( "organisationunitid" ) ); - value.setOrganisationUnitName( resultSet.getString( "name" ) ); - value.setValue( resultSet.getDouble( "value" ) ); - - return value; - } - - @Override - public AggregatedMapValue mapRow( ResultSet resultSet, int rowNum ) - throws SQLException - { - return mapRow( resultSet ); - } -} === removed file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java 1970-01-01 00:00:00 +0000 @@ -1,65 +0,0 @@ -package org.hisp.dhis.system.objectmapper; - -/* - * Copyright (c) 2004-2012, 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 java.sql.ResultSet; -import java.sql.SQLException; - -import org.amplecode.quick.mapper.RowMapper; -import org.hisp.dhis.aggregation.AggregatedMapValue; - -/** - * @author Lars Helge Overland - * @version $Id$ - */ -public class AggregatedIndicatorMapValueRowMapper - implements RowMapper, org.springframework.jdbc.core.RowMapper -{ - public AggregatedMapValue mapRow( ResultSet resultSet ) - throws SQLException - { - final AggregatedMapValue value = new AggregatedMapValue(); - - value.setPeriodId( resultSet.getInt( "periodid" ) ); - value.setOrganisationUnitId( resultSet.getInt( "organisationunitid" ) ); - value.setOrganisationUnitName( resultSet.getString( "name" ) ); - value.setValue( resultSet.getDouble( "value" ) ); - value.setFactor( resultSet.getDouble( "factor" ) ); - value.setNumeratorValue( resultSet.getDouble( "numeratorvalue" ) ); - value.setDenominatorValue( resultSet.getDouble( "denominatorvalue" ) ); - - return value; - } - - @Override - public AggregatedMapValue mapRow( ResultSet resultSet, int rowNum ) - throws SQLException - { - return mapRow( resultSet ); - } -}