Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / StatisticsServiceImpl.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/StatisticsServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/StatisticsServiceImpl.java
index 6f793512215fdce51f13ca48f8d555b8f6a1d0ef..847c4ba63bcc7c5e6acb1fffd6873a081a65667c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/StatisticsServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/StatisticsServiceImpl.java
@@ -13,7 +13,7 @@ import eu.etaxonomy.cdm.api.service.statistics.StatisticsConfigurator;
 import eu.etaxonomy.cdm.api.service.statistics.StatisticsTypeEnum;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -122,18 +122,16 @@ public class StatisticsServiceImpl implements IStatisticsService {
                        switch (type) {
 
                        case ALL_TAXA:
-                               counter = Long.valueOf(taxonDao.count(TaxonBase.class));
+                               counter = taxonDao.count(TaxonBase.class);
                                break;
                        case SYNONYMS:
-                               counter = Long.valueOf(taxonDao.count(Synonym.class));
+                               counter = taxonDao.count(Synonym.class);
                                break;
                        case ACCEPTED_TAXA:
-                               counter = Long.valueOf(taxonDao.count(Taxon.class));
+                               counter = taxonDao.count(Taxon.class);
                                break;
                        case ALL_REFERENCES:
-                               counter = Long
-                                               .valueOf(referenceDao
-                                                               .count(eu.etaxonomy.cdm.model.reference.Reference.class));
+                               counter = referenceDao.count(eu.etaxonomy.cdm.model.reference.Reference.class);
                                counter -=statisticsDao.countNomenclaturalReferences();
                                break;
 
@@ -143,13 +141,12 @@ public class StatisticsServiceImpl implements IStatisticsService {
                                break;
 
                        case CLASSIFICATION:
-                               counter = Long.valueOf(classificationDao
-                                               .count(Classification.class));
+                               counter = classificationDao.count(Classification.class);
 
                                break;
 
                        case TAXON_NAMES:
-                               counter = Long.valueOf(taxonNameDao.count(TaxonNameBase.class));
+                               counter = taxonNameDao.count(TaxonName.class);
                                break;
 
                        case DESCRIPTIVE_SOURCE_REFERENCES:
@@ -159,7 +156,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
                                break;
                        case DESCRIPTIONS:
 
-                               counter = Long.valueOf(descriptionDao.count(DescriptionBase.class));
+                               counter = descriptionDao.count(DescriptionBase.class);
 
                                break;
                        }