dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11585
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3333: Removed unused class
------------------------------------------------------------
revno: 3333
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-04-10 15:48:29 +0200
message:
Removed unused class
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociation.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociationDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/FrequencyOverrideAssociation.hbm.xml
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.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-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2011-04-10 13:48:29 +0000
@@ -221,63 +221,6 @@
*/
Collection<DataSet> getMobileDataSetsFromCategory(int categoryOptionId);
- // -------------------------------------------------------------------------
- // FrequencyOverrideAssociation
- // -------------------------------------------------------------------------
-
- /**
- * Adds a FrequencyOverrideAssociation.
- *
- * @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
- * add.
- */
- void addFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
-
- /**
- * Updates a FrequencyOverrideAssociation.
- *
- * @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
- * update.
- */
- void updateFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
-
- /**
- * Removes a FrequencyOverrideAssociation.
- *
- * @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
- * remove.
- */
- void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
-
- /**
- * Retrieves a FrequencyOverrideAssociation.
- *
- * @param dataSet The DataSet referred to by the
- * FrequencyOverrideAssociation.
- * @param source The Source referred to by the FrequencyOverrideAssociation.
- * @return The FrequencyOverrideAssociation for the given DataSet and
- * Source.
- */
- FrequencyOverrideAssociation getFrequencyOverrideAssociation( DataSet dataSet, Source source );
-
- /**
- * Retrieves FrequencyOverrideAssociations for a given DataSet.
- *
- * @param dataSet The DataSet.
- * @return A collection of FrequencyOverrideAssociations for the given
- * DataSet.
- */
- Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsByDataSet( DataSet dataSet );
-
- /**
- * Retrieves FrequencyOverrideAssociations for a given Source.
- *
- * @param source The Source.
- * @return A collection of FrequencyOverrideAssociations for the given
- * Source.
- */
- Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsBySource( Source source );
-
int getDataSetCountByName( String name );
Collection<DataSet> getDataSetsBetweenByName( String name, int first, int max );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java 2011-04-10 13:48:29 +0000
@@ -134,63 +134,7 @@
Collection<DataSet> getMobileDataSetsFromCategoryOption(int categoryOptionId);
Collection<DataSet> getMobileDataSetsFromCategory(int categoryId);
- // -------------------------------------------------------------------------
- // FrequencyOverrideAssociation
- // -------------------------------------------------------------------------
-
- /**
- * Adds a FrequencyOverrideAssociation.
- *
- * @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
- * add.
- */
- void addFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
-
- /**
- * Updates a FrequencyOverrideAssociation.
- *
- * @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
- * update.
- */
- void updateFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
-
- /**
- * Removes a FrequencyOverrideAssociation.
- *
- * @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
- * remove.
- */
- void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
-
- /**
- * Retrieves a FrequencyOverrideAssociation.
- *
- * @param dataSet The DataSet referred to by the
- * FrequencyOverrideAssociation.
- * @param source The Source referred to by the FrequencyOverrideAssociation.
- * @return The FrequencyOverrideAssociation for the given DataSet and
- * Source.
- */
- FrequencyOverrideAssociation getFrequencyOverrideAssociation( DataSet dataSet, Source source );
-
- /**
- * Retrieves FrequencyOverrideAssociations for a given DataSet.
- *
- * @param dataSet The DataSet.
- * @return A collection of FrequencyOverrideAssociations for the given
- * DataSet.
- */
- Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsByDataSet( DataSet dataSet );
-
- /**
- * Retrieves FrequencyOverrideAssociations for a given Source.
- *
- * @param source The Source.
- * @return A collection of FrequencyOverrideAssociations for the given
- * Source.
- */
- Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsBySource( Source source );
-
+
int getDataSetCountByName( String name );
Collection<DataSet> getDataSetsBetweenByName( String name, int first, int max );
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociation.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociation.java 1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-package org.hisp.dhis.dataset;
-
-/*
- * 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 java.io.Serializable;
-
-import org.hisp.dhis.period.PeriodType;
-import org.hisp.dhis.source.Source;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: FrequencyOverrideAssociation.java 3331 2007-06-01 07:29:02Z torgeilo $
- */
-public class FrequencyOverrideAssociation
- implements Serializable
-{
- /**
- * Part of the association's composite ID.
- */
- private DataSet dataSet;
-
- /**
- * Part of the association's composite ID.
- */
- private Source source;
-
- /**
- * The override
- */
- private PeriodType periodType;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public FrequencyOverrideAssociation()
- {
- }
-
- public FrequencyOverrideAssociation( DataSet dataSet, Source source, PeriodType periodType )
- {
- this.dataSet = dataSet;
- this.source = source;
- this.periodType = periodType;
- }
-
- // -------------------------------------------------------------------------
- // HashCode and equals
- // -------------------------------------------------------------------------
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
-
- result = prime * result + dataSet.hashCode();
- result = prime * result + source.hashCode();
-
- return result;
- }
-
- @Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
- return true;
- }
-
- if ( o == null )
- {
- return false;
- }
-
- if ( !(o instanceof FrequencyOverrideAssociation) )
- {
- return false;
- }
-
- final FrequencyOverrideAssociation other = (FrequencyOverrideAssociation) o;
-
- return dataSet.equals( other.getDataSet() ) && source.equals( other.getSource() );
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- public DataSet getDataSet()
- {
- return dataSet;
- }
-
- public void setDataSet( DataSet dataSet )
- {
- this.dataSet = dataSet;
- }
-
- public Source getSource()
- {
- return source;
- }
-
- public void setSource( Source source )
- {
- this.source = source;
- }
-
- public PeriodType getPeriodType()
- {
- return periodType;
- }
-
- public void setPeriodType( PeriodType periodType )
- {
- this.periodType = periodType;
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java 2011-02-11 10:53:00 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java 2011-04-10 13:48:29 +0000
@@ -93,11 +93,6 @@
jdbcTemplate.execute( sql );
log.info( "Deleting values into datasetsource sucessfully" );
- // delete values into frequencyoverrideassociation table
- sql = "delete from frequencyoverrideassociation where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
- log.info( "Deleting values into frequencyoverrideassociation sucessfully" );
-
// delete values into minmaxdataelement table
sql = "delete from minmaxdataelement where sourceid in (" + orgUnitIds + ");";
jdbcTemplate.execute( sql );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2011-04-10 13:48:29 +0000
@@ -299,39 +299,6 @@
public Collection<DataSet> getMobileDataSetsFromCategory(int categoryId){
return dataSetStore.getMobileDataSetsFromCategory(categoryId);
}
- // -------------------------------------------------------------------------
- // FrequencyOverrideAssociation
- // -------------------------------------------------------------------------
-
- public void addFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
- {
- dataSetStore.addFrequencyOverrideAssociation( frequencyOverrideAssociation );
- }
-
- public void updateFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
- {
- dataSetStore.updateFrequencyOverrideAssociation( frequencyOverrideAssociation );
- }
-
- public void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
- {
- dataSetStore.deleteFrequencyOverrideAssociation( frequencyOverrideAssociation );
- }
-
- public FrequencyOverrideAssociation getFrequencyOverrideAssociation( DataSet dataSet, Source source )
- {
- return dataSetStore.getFrequencyOverrideAssociation( dataSet, source );
- }
-
- public Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsByDataSet( DataSet dataSet )
- {
- return dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet );
- }
-
- public Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsBySource( Source source )
- {
- return dataSetStore.getFrequencyOverrideAssociationsBySource( source );
- }
@Override
public int getDataSetCount()
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociationDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociationDeletionHandler.java 2010-05-17 22:46:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociationDeletionHandler.java 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-package org.hisp.dhis.dataset;
-
-/*
- * 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 org.hisp.dhis.source.Source;
-import org.hisp.dhis.system.deletion.DeletionHandler;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class FrequencyOverrideAssociationDeletionHandler
- extends DeletionHandler
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- // -------------------------------------------------------------------------
- // DeletionHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String getClassName()
- {
- return FrequencyOverrideAssociation.class.getSimpleName();
- }
-
- @Override
- public void deleteDataSet( DataSet dataSet )
- {
- for ( FrequencyOverrideAssociation association : dataSetService.getFrequencyOverrideAssociationsByDataSet( dataSet ) )
- {
- dataSetService.deleteFrequencyOverrideAssociation( association );
- }
- }
-
- @Override
- public void deleteSource( Source source )
- {
- for ( FrequencyOverrideAssociation association : dataSetService.getFrequencyOverrideAssociationsBySource( source ) )
- {
- dataSetService.deleteFrequencyOverrideAssociation( association );
- }
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java 2011-04-10 13:48:29 +0000
@@ -43,7 +43,6 @@
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetStore;
-import org.hisp.dhis.dataset.FrequencyOverrideAssociation;
import org.hisp.dhis.hibernate.HibernateGenericStore;
import org.hisp.dhis.period.PeriodStore;
import org.hisp.dhis.period.PeriodType;
@@ -273,76 +272,6 @@
return mobileDataSets;
}
- // -------------------------------------------------------------------------
- // FrequencyOverrideAssociation
- // -------------------------------------------------------------------------
-
- public void addFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
- {
- PeriodType periodType = PeriodType.getPeriodTypeByName( frequencyOverrideAssociation.getPeriodType().getName() );
-
- periodType = periodStore.getPeriodType( periodType.getClass() );
-
- frequencyOverrideAssociation.setPeriodType( periodType );
-
- Session session = sessionFactory.getCurrentSession();
-
- session.save( frequencyOverrideAssociation );
- }
-
- public void updateFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
- {
- PeriodType periodType = PeriodType.getPeriodTypeByName( frequencyOverrideAssociation.getPeriodType().getName() );
-
- periodType = periodStore.getPeriodType( periodType.getClass() );
-
- frequencyOverrideAssociation.setPeriodType( periodType );
-
- Session session = sessionFactory.getCurrentSession();
-
- session.update( frequencyOverrideAssociation );
- }
-
- public void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
- {
- Session session = sessionFactory.getCurrentSession();
-
- session.delete( frequencyOverrideAssociation );
- }
-
- public FrequencyOverrideAssociation getFrequencyOverrideAssociation( DataSet dataSet, Source source )
- {
- Session session = sessionFactory.getCurrentSession();
-
- Criteria criteria = session.createCriteria( FrequencyOverrideAssociation.class );
- criteria.add( Restrictions.eq( "dataSet", dataSet ) );
- criteria.add( Restrictions.eq( "source", source ) );
-
- return (FrequencyOverrideAssociation) criteria.uniqueResult();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsByDataSet( DataSet dataSet )
- {
- Session session = sessionFactory.getCurrentSession();
-
- Criteria criteria = session.createCriteria( FrequencyOverrideAssociation.class );
- criteria.add( Restrictions.eq( "dataSet", dataSet ) );
-
- return criteria.list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<FrequencyOverrideAssociation> getFrequencyOverrideAssociationsBySource( Source source )
- {
- Session session = sessionFactory.getCurrentSession();
-
- Criteria criteria = session.createCriteria( FrequencyOverrideAssociation.class );
- criteria.add( Restrictions.eq( "source", source ) );
-
- return criteria.list();
- }
-
@Override
public int getDataSetCount()
{
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-04-01 13:46:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-04-10 13:48:29 +0000
@@ -86,6 +86,7 @@
executeSql( "DROP TABLE customvalue" );
executeSql( "DROP TABLE reporttable_displaycolumns" );
executeSql( "DROP TABLE reportreporttables" );
+ executeSql( "DROP TABLE frequencyoverrideassociation" );
executeSql( "ALTER TABLE dataelementcategoryoption drop column categoryid" );
executeSql( "ALTER TABLE reporttable DROP column dimension_type" );
executeSql( "ALTER TABLE reporttable DROP column dimensiontype" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-04-06 18:25:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-04-10 13:48:29 +0000
@@ -1108,11 +1108,6 @@
<property name="sectionService" ref="org.hisp.dhis.dataset.SectionService" />
</bean>
- <bean id="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler"
- class="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler">
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- </bean>
-
<bean id="org.hisp.dhis.expression.ExpressionDeletionHandler"
class="org.hisp.dhis.expression.ExpressionDeletionHandler">
<property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
@@ -1221,7 +1216,6 @@
<ref local="org.hisp.dhis.dataset.DataSetDeletionHandler" />
<ref local="org.hisp.dhis.dataset.CompleteDataSetRegistrationDeletionHandler" />
<ref local="org.hisp.dhis.dataset.SectionDeletionHandler" />
- <ref local="org.hisp.dhis.dataset.FrequencyOverrideAssociationDeletionHandler" />
<ref local="org.hisp.dhis.expression.ExpressionDeletionHandler" />
<ref local="org.hisp.dhis.indicator.IndicatorDeletionHandler" />
<ref local="org.hisp.dhis.indicator.IndicatorGroupDeletionHandler" />
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/FrequencyOverrideAssociation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/FrequencyOverrideAssociation.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/FrequencyOverrideAssociation.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.dataset.FrequencyOverrideAssociation"
- table="frequencyoverrideassociation">
- <composite-id>
- <!--
- The source relationship is made not lazy so that Hibernate won't put a
- proxy on the reference which cannot be casted to the desired subclass.
- -->
- <key-many-to-one name="source" class="org.hisp.dhis.source.Source" lazy="false"
- column="sourceid" foreign-key="fk_freqoverride_sourceid"/>
- <key-many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet"
- column="datasetid" foreign-key="fk_freqoverride_datasetid"/>
- </composite-id>
- <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType" lazy="false"
- column="periodtypeid" not-null="true" foreign-key="fk_freqoverride_peiodtypeid"/>
- </class>
-</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java 2011-04-10 13:48:29 +0000
@@ -245,56 +245,4 @@
assertTrue( dataSets.contains( dataSetA ) );
assertTrue( dataSets.contains( dataSetB ) );
}
-
- // -------------------------------------------------------------------------
- // FrequencyOverrideAssociation
- // -------------------------------------------------------------------------
-
- @Test
- public void testFrequencyOverrideAssociation()
- throws Exception
- {
- PeriodType periodType1 = periodStore.getPeriodType( YearlyPeriodType.class );
- PeriodType periodType2 = periodStore.getPeriodType( MonthlyPeriodType.class );
- PeriodType periodType3 = periodStore.getPeriodType( WeeklyPeriodType.class );
-
- DataSet dataSet1 = new DataSet( "name1", periodType1 );
- DataSet dataSet2 = new DataSet( "name2", periodType2 );
-
- dataSetStore.addDataSet( dataSet1 );
- dataSetStore.addDataSet( dataSet2 );
-
- Source source1 = new MockSource( "Source1" );
- Source source2 = new MockSource( "Source2" );
- sourceStore.addSource( source1 );
- sourceStore.addSource( source2 );
-
- FrequencyOverrideAssociation association = new FrequencyOverrideAssociation( dataSet1, source1, periodType3 );
-
- dataSetStore.addFrequencyOverrideAssociation( association );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet1 ).size(), 1 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source1 ).size(), 1 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 0 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source2 ).size(), 0 );
-
- dataSetStore
- .addFrequencyOverrideAssociation( new FrequencyOverrideAssociation( dataSet1, source2, periodType3 ) );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet1 ).size(), 2 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source1 ).size(), 1 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 0 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source2 ).size(), 1 );
-
- dataSetStore
- .addFrequencyOverrideAssociation( new FrequencyOverrideAssociation( dataSet2, source1, periodType3 ) );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet1 ).size(), 2 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source1 ).size(), 2 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 1 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source2 ).size(), 1 );
-
- dataSetStore.deleteFrequencyOverrideAssociation( association );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet1 ).size(), 1 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source1 ).size(), 1 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 1 );
- assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source2 ).size(), 1 );
- }
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2010-11-30 08:39:40 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2011-04-10 13:48:29 +0000
@@ -42,7 +42,6 @@
import org.hisp.dhis.datamart.DataMartExport;
import org.hisp.dhis.dataset.CompleteDataSetRegistration;
import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.FrequencyOverrideAssociation;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.datavalue.DataValue;
import org.hisp.dhis.document.Document;
@@ -327,15 +326,6 @@
return true;
}
- public void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation association )
- {
- }
-
- public boolean allowDeleteFrequencyOverrideAssociation( FrequencyOverrideAssociation association )
- {
- return true;
- }
-
public void deleteDataEntryForm( DataEntryForm form )
{
}
