ref #1445: improve search for identical names

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

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyServiceImpl.java
index 2fb667f125cd029ed1ff365811600eb2e4e21f07..14c15247f2656446c249d46e133cac81d203f6d0 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyServiceImpl.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IIdentificationKeyDao;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IPolytomousKeyDao;\r
-import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;\r
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;\r
 \r
 @Service\r
@@ -40,7 +39,7 @@ import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 public class PolytomousKeyServiceImpl extends IdentifiableServiceBase<PolytomousKey, IPolytomousKeyDao> implements IPolytomousKeyService {\r
 \r
        private IIdentificationKeyDao identificationKeyDao;\r
-       private ITaxonDao taxonDao;\r
+\r
        @Autowired\r
        private IPolytomousKeyNodeService nodeService;\r
 \r
@@ -56,29 +55,14 @@ public class PolytomousKeyServiceImpl extends IdentifiableServiceBase<Polytomous
                this.identificationKeyDao = identificationKeyDao;\r
        }\r
 \r
-       @Autowired\r
-       protected void setDao(ITaxonDao taxonDao) {\r
-               this.taxonDao = taxonDao;\r
-       }\r
-\r
-\r
-\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#updateTitleCache(java.lang.Integer, eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy)\r
-        */\r
        @Override\r
-       public void updateTitleCache(Class<? extends PolytomousKey> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<PolytomousKey> cacheStrategy, IProgressMonitor monitor) {\r
+       public UpdateResult updateCaches(Class<? extends PolytomousKey> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<PolytomousKey> cacheStrategy, IProgressMonitor monitor) {\r
                if (clazz == null){\r
                        clazz = PolytomousKey.class;\r
                }\r
-               super.updateTitleCacheImpl(clazz, stepSize, cacheStrategy, monitor);\r
+               return super.updateCachesImpl(clazz, stepSize, cacheStrategy, monitor);\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.IFeatureTreeService#loadWithNodes(java.util.UUID, java.util.List, java.util.List)\r
-        */\r
        @Override\r
     public PolytomousKey loadWithNodes(UUID uuid, List<String> propertyPaths, List<String> nodePaths) {\r
 \r
@@ -112,10 +96,6 @@ public class PolytomousKeyServiceImpl extends IdentifiableServiceBase<Polytomous
                return super.load(uuid, propertyPaths);\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.IPolytomousKeyService#findByTaxonomicScope(eu.etaxonomy.cdm.model.taxon.TaxonBase, java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List)\r
-        */\r
        @Override\r
        public Pager<PolytomousKey> findByTaxonomicScope(\r
                        TaxonBase taxon, Integer pageSize,\r
@@ -131,7 +111,7 @@ public class PolytomousKeyServiceImpl extends IdentifiableServiceBase<Polytomous
                                dao.loadNodes(polytomousKey.getRoot(), nodePaths);\r
                        }\r
                }\r
-               Pager<PolytomousKey> pager = new DefaultPagerImpl<PolytomousKey>(pageNumber, numberOfResults.intValue(), pageSize, list);\r
+               Pager<PolytomousKey> pager = new DefaultPagerImpl<PolytomousKey>(pageNumber, numberOfResults, pageSize, list);\r
 \r
                return pager;\r
        }\r