dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01410
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 420: Renamed method to improve consistency in DataSetService.
------------------------------------------------------------
revno: 420
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-07-07 00:27:41 +0200
message:
Renamed method to improve consistency in DataSetService.
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-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.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/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.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/DataSetServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java
=== 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 2009-03-11 15:16:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2009-07-06 22:27:41 +0000
@@ -194,7 +194,7 @@
* @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
* remove.
*/
- void removeFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
+ void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
/**
* Retrieves a FrequencyOverrideAssociation.
=== 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 2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java 2009-07-06 22:27:41 +0000
@@ -130,7 +130,7 @@
* @param frequencyOverrideAssociation The FrequencyOverrideAssociation to
* remove.
*/
- void removeFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
+ void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation );
/**
* Retrieves a FrequencyOverrideAssociation.
=== 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 2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2009-07-06 22:27:41 +0000
@@ -270,9 +270,9 @@
dataSetStore.updateFrequencyOverrideAssociation( frequencyOverrideAssociation );
}
- public void removeFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
+ public void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
{
- dataSetStore.removeFrequencyOverrideAssociation( frequencyOverrideAssociation );
+ dataSetStore.deleteFrequencyOverrideAssociation( frequencyOverrideAssociation );
}
public FrequencyOverrideAssociation getFrequencyOverrideAssociation( DataSet dataSet, Source source )
=== modified 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 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/FrequencyOverrideAssociationDeletionHandler.java 2009-07-06 22:27:41 +0000
@@ -73,7 +73,7 @@
{
deletionManager.execute( association );
- dataSetService.removeFrequencyOverrideAssociation( association );
+ dataSetService.deleteFrequencyOverrideAssociation( association );
}
}
@@ -84,7 +84,7 @@
{
deletionManager.execute( association );
- dataSetService.removeFrequencyOverrideAssociation( association );
+ 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 2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java 2009-07-06 22:27:41 +0000
@@ -173,7 +173,7 @@
session.update( frequencyOverrideAssociation );
}
- public void removeFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
+ public void deleteFrequencyOverrideAssociation( FrequencyOverrideAssociation frequencyOverrideAssociation )
{
Session session = sessionFactory.getCurrentSession();
=== 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 2009-07-05 20:32:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2009-07-06 22:27:41 +0000
@@ -526,7 +526,6 @@
<value>.*\.DataElementCategoryComboService\.delete.*</value>
<value>.*\.DataElementCategoryOptionService\.delete.*</value>
<value>.*\.DataSetService\.delete.*</value>
- <value>.*\.DataSetService\.remove.*</value>
<value>.*\.IndicatorService\.delete.*</value>
<value>.*\.ExpressionService\.delete.*</value>
<value>.*\.MinMaxDataElementService\.delete.*</value>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java 2009-07-06 17:45:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java 2009-07-06 22:27:41 +0000
@@ -386,7 +386,7 @@
assertEquals( dataSetService.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 1 );
assertEquals( dataSetService.getFrequencyOverrideAssociationsBySource( source2 ).size(), 1 );
- dataSetService.removeFrequencyOverrideAssociation( association );
+ dataSetService.deleteFrequencyOverrideAssociation( association );
assertEquals( dataSetService.getFrequencyOverrideAssociationsByDataSet( dataSet1 ).size(), 1 );
assertEquals( dataSetService.getFrequencyOverrideAssociationsBySource( source1 ).size(), 1 );
assertEquals( dataSetService.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 1 );
=== 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 2009-07-06 17:45:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java 2009-07-06 22:27:41 +0000
@@ -241,7 +241,7 @@
assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 1 );
assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source2 ).size(), 1 );
- dataSetStore.removeFrequencyOverrideAssociation( association );
+ dataSetStore.deleteFrequencyOverrideAssociation( association );
assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet1 ).size(), 1 );
assertEquals( dataSetStore.getFrequencyOverrideAssociationsBySource( source1 ).size(), 1 );
assertEquals( dataSetStore.getFrequencyOverrideAssociationsByDataSet( dataSet2 ).size(), 1 );
--
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.
