bugfix for DescriptionDaoImpl.getDescriptionElementForTaxon (missing implementation...

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
index 27eb2b00bdf23a327e0d5b939db71b166fcf8994..ac5cdec3b7738f34f5233ff2d47e098eede69be5 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
@@ -13,7 +13,6 @@ package eu.etaxonomy.cdm.api.service;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -336,12 +335,12 @@ public class DescriptionServiceImpl extends IdentifiableServiceBase<DescriptionB
                return (TermVocabulary)vocabularyDao.findByUuid(uuid);
        }
 
-       public List<DescriptionElementBase> getDescriptionElementsForTaxon(
+       public <T extends DescriptionElementBase> List<T> getDescriptionElementsForTaxon(
                        Taxon taxon, Set<Feature> features,
-                       Class<? extends DescriptionElementBase> type, Integer pageSize,
+                       Class<? extends T> type, Integer pageSize,
                        Integer pageNumber, List<String> propertyPaths) {
                //FIXME remove cast
-               return (List<DescriptionElementBase>) dao.getDescriptionElementForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
+               return (List<T>) dao.getDescriptionElementForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
        }
        
        public List<DescriptionElementBase> getDescriptionElementsForTaxon(

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
index d622b995e48d6af07a3bc22ec41de6ea7edb5e0a..aee1ee08e25a767cbd399b39c7d03eb139937d5c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
@@ -248,7 +248,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
      */
     public Pager<Media> getMedia(DescriptionElementBase descriptionElement, Integer pageSize, Integer pageNumber, List<String> propertyPaths);
     
-    public List<DescriptionElementBase> getDescriptionElementsForTaxon(Taxon taxon, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths);
+    public <T extends DescriptionElementBase> List<T>  getDescriptionElementsForTaxon(Taxon taxon, Set<Feature> features, Class<? extends T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths);
 
        public DistributionTree getOrderedDistributions(Set<TaxonDescription> taxonDescriptions, Set<NamedAreaLevel> levels, List<String> propertyPaths);