------------------------------------------------------------
revno: 21621
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Wed 2016-01-06 15:03:52 +0100
message:
Rename methods
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateAnalyticalObjectStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.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/common/AnalyticalObjectStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java 2016-01-06 13:45:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java 2016-01-06 14:03:52 +0000
@@ -58,17 +58,17 @@
List<T> getAnalyticalObjects( CategoryOptionGroup categoryOptionGroup );
- int countAnalyticalObject( Indicator indicator );
-
- int countAnalyticalObject( DataElement dataElement );
-
- int countAnalyticalObject( DataSet dataSet );
-
- int countAnalyticalObject( ProgramIndicator programIndicator );
-
- int countAnalyticalObject( Period period );
-
- int countAnalyticalObject( OrganisationUnit organisationUnit );
-
- int countAnalyticalObject( CategoryOptionGroup categoryOptionGroup );
+ int countAnalyticalObjects( Indicator indicator );
+
+ int countAnalyticalObjects( DataElement dataElement );
+
+ int countAnalyticalObjects( DataSet dataSet );
+
+ int countAnalyticalObjects( ProgramIndicator programIndicator );
+
+ int countAnalyticalObjects( Period period );
+
+ int countAnalyticalObjects( OrganisationUnit organisationUnit );
+
+ int countAnalyticalObjects( CategoryOptionGroup categoryOptionGroup );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateAnalyticalObjectStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateAnalyticalObjectStore.java 2016-01-06 13:50:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateAnalyticalObjectStore.java 2016-01-06 14:03:52 +0000
@@ -106,7 +106,7 @@
}
@Override
- public int countAnalyticalObject( Indicator indicator )
+ public int countAnalyticalObjects( Indicator indicator )
{
Query query = getQuery( "select count(distinct c) from " + clazz.getName() + " c join c.dataDimensionItems d where d.indicator = :indicator" );
query.setEntity( "indicator", indicator );
@@ -115,7 +115,7 @@
}
@Override
- public int countAnalyticalObject( DataElement dataElement )
+ public int countAnalyticalObjects( DataElement dataElement )
{
Query query = getQuery( "select count(distinct c) from " + clazz.getName() + " c join c.dataDimensionItems d where d.dataElement = :dataElement" );
query.setEntity( "dataElement", dataElement );
@@ -124,7 +124,7 @@
}
@Override
- public int countAnalyticalObject( DataSet dataSet )
+ public int countAnalyticalObjects( DataSet dataSet )
{
Query query = getQuery( "select count(distinct c) from " + clazz.getName() + " c join c.dataDimensionItems d where d.dataSet = :dataSet" );
query.setEntity( "dataSet", dataSet );
@@ -133,7 +133,7 @@
}
@Override
- public int countAnalyticalObject( ProgramIndicator programIndicator )
+ public int countAnalyticalObjects( ProgramIndicator programIndicator )
{
Query query = getQuery( "select count(distinct c) from " + clazz.getName() + " c join c.dataDimensionItems d where d.programIndicator = :programIndicator" );
query.setEntity( "dataSet", programIndicator );
@@ -142,7 +142,7 @@
}
@Override
- public int countAnalyticalObject( Period period )
+ public int countAnalyticalObjects( Period period )
{
Query query = getQuery( "select count(distinct c) from " + clazz.getName() + " c where :period in elements(c.periods)" );
query.setEntity( "period", period );
@@ -151,7 +151,7 @@
}
@Override
- public int countAnalyticalObject( OrganisationUnit organisationUnit )
+ public int countAnalyticalObjects( OrganisationUnit organisationUnit )
{
Query query = getQuery( "select count(distinct c) from " + clazz.getName() + " c where :organisationUnit in elements(c.organisationUnits)" );
query.setEntity( "organisationUnit", organisationUnit );
@@ -160,7 +160,7 @@
}
@Override
- public int countAnalyticalObject( CategoryOptionGroup categoryOptionGroup )
+ public int countAnalyticalObjects( CategoryOptionGroup categoryOptionGroup )
{
Query query = getQuery( "select count(distinct c) from " + clazz.getName() + " c where :categoryOptionGroup in elements(c.categoryOptionGroups)" );
query.setEntity( "categoryOptionGroup", categoryOptionGroup );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java 2016-01-06 13:45:38 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java 2016-01-06 14:03:52 +0000
@@ -317,30 +317,30 @@
@Override
public int countDataSetMapViews( DataSet dataSet )
{
- return mapViewStore.countAnalyticalObject( dataSet );
+ return mapViewStore.countAnalyticalObjects( dataSet );
}
@Override
public int countIndicatorMapViews( Indicator indicator )
{
- return mapViewStore.countAnalyticalObject( indicator );
+ return mapViewStore.countAnalyticalObjects( indicator );
}
@Override
public int countDataElementMapViews( DataElement dataElement )
{
- return mapViewStore.countAnalyticalObject( dataElement );
+ return mapViewStore.countAnalyticalObjects( dataElement );
}
@Override
public int countPeriodMapViews( Period period )
{
- return mapViewStore.countAnalyticalObject( period );
+ return mapViewStore.countAnalyticalObjects( period );
}
@Override
public int countOrganisationUnitMapViews( OrganisationUnit organisationUnit )
{
- return mapViewStore.countAnalyticalObject( organisationUnit );
+ return mapViewStore.countAnalyticalObjects( organisationUnit );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2016-01-06 13:45:38 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2016-01-06 14:03:52 +0000
@@ -984,36 +984,36 @@
@Override
public int countDataSetCharts( DataSet dataSet )
{
- return chartStore.countAnalyticalObject( dataSet );
+ return chartStore.countAnalyticalObjects( dataSet );
}
@Override
public int countIndicatorCharts( Indicator indicator )
{
- return chartStore.countAnalyticalObject( indicator );
+ return chartStore.countAnalyticalObjects( indicator );
}
@Override
public int countDataElementCharts( DataElement dataElement )
{
- return chartStore.countAnalyticalObject( dataElement );
+ return chartStore.countAnalyticalObjects( dataElement );
}
@Override
public int countPeriodCharts( Period period )
{
- return chartStore.countAnalyticalObject( period );
+ return chartStore.countAnalyticalObjects( period );
}
@Override
public int countOrganisationUnitCharts( OrganisationUnit organisationUnit )
{
- return chartStore.countAnalyticalObject( organisationUnit );
+ return chartStore.countAnalyticalObjects( organisationUnit );
}
@Override
public int countCategoryOptionGroups( CategoryOptionGroup categoryOptionGroup )
{
- return chartStore.countAnalyticalObject( categoryOptionGroup );
+ return chartStore.countAnalyticalObjects( categoryOptionGroup );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2016-01-06 13:45:38 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2016-01-06 14:03:52 +0000
@@ -228,36 +228,36 @@
@Override
public int countDataSetReportTables( DataSet dataSet )
{
- return reportTableStore.countAnalyticalObject( dataSet );
+ return reportTableStore.countAnalyticalObjects( dataSet );
}
@Override
public int countIndicatorReportTables( Indicator indicator )
{
- return reportTableStore.countAnalyticalObject( indicator );
+ return reportTableStore.countAnalyticalObjects( indicator );
}
@Override
public int countDataElementReportTables( DataElement dataElement )
{
- return reportTableStore.countAnalyticalObject( dataElement );
+ return reportTableStore.countAnalyticalObjects( dataElement );
}
@Override
public int countPeriodReportTables( Period period )
{
- return reportTableStore.countAnalyticalObject( period );
+ return reportTableStore.countAnalyticalObjects( period );
}
@Override
public int countOrganisationUnitReportTables( OrganisationUnit organisationUnit )
{
- return reportTableStore.countAnalyticalObject( organisationUnit );
+ return reportTableStore.countAnalyticalObjects( organisationUnit );
}
@Override
public int countCategoryOptionGroups( CategoryOptionGroup categoryOptionGroup )
{
- return reportTableStore.countAnalyticalObject( categoryOptionGroup );
+ return reportTableStore.countAnalyticalObjects( categoryOptionGroup );
}
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
