Generalize term service method listByTermType()

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
index 109a80899fca31e51f50cd529ba8de9b80b08149..d7010659231cc7284adc61cdf7bee3cdbdd657a0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@ -857,7 +857,7 @@ public class TransientTermService implements ITermService {
      * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
      */
     @Override
      * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
      */
     @Override

-    public List<DefinedTermBase<?>> listByTermType(TermType termType, Integer limit, Integer start,
+    public <TERM extends DefinedTermBase> List<TERM> listByTermType(TermType termType, Integer limit, Integer start,

             List<OrderHint> orderHints, List<String> propertyPaths) {
         return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
     }
             List<OrderHint> orderHints, List<String> propertyPaths) {
         return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
index 47650d4e1103c934781539764713f91a62437cf3..822e562b7569b7119441b6ecf0801e9e6b74f1b0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
@@ -52,8 +52,8 @@ public class TermManager extends ContextListenerAdapter{
         * @param clazz
         * @return
         */
         * @param clazz
         * @return
         */

-       public List<DefinedTermBase<?>> getPreferredTerms(TermType termType){
-           return getFilteredTerms(TermStore.getTerms(termType, null));
+       public <T extends DefinedTermBase> List<T> getPreferredTerms(TermType termType){
+           return getFilteredTerms(TermStore.<T>getTerms(termType, null));

        }
 
        /**
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
index 5896718b8b4f260715c4d45729ded9fdb301784a..60cd92d7eccf2858a1c0187195fd867b7947f7a7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
@@ -60,7 +60,7 @@ public class TermStore {
         * @param termType the term type
         * @return an alphabetically sorted list of terms
         */
         * @param termType the term type
         * @return an alphabetically sorted list of terms
         */

-       public static List<DefinedTermBase<?>> getTerms(TermType termType, Comparator<DefinedTermBase<?>> comparator){
+       public static <TERM extends DefinedTermBase> List<TERM> getTerms(TermType termType, Comparator<TERM> comparator){

         return getTermsFromService(termType, comparator);
        }
 
         return getTermsFromService(termType, comparator);
        }
 


@@ -105,12 +105,12 @@ public class TermStore {
         * @param comparator
         * @return
         */
         * @param comparator
         * @return
         */

-       private static List<DefinedTermBase<?>> getTermsFromService(TermType termType, Comparator<DefinedTermBase<?>> comparator){
+       private static <T extends DefinedTermBase> List<T> getTermsFromService(TermType termType, Comparator<T> comparator){

            if (comparator == null){
            if (comparator == null){

-               comparator = new DefaultTermComparator<DefinedTermBase<?>>();
+               comparator = new DefaultTermComparator<T>();

            }
 
            }
 

-           List<DefinedTermBase<?>> terms = CdmStore.getService(ITermService.class).listByTermType(termType, null, null, null, null);
+           List<T> terms = CdmStore.getService(ITermService.class).listByTermType(termType, null, null, null, null);

            Collections.sort(terms, comparator);
            return terms;
        }
            Collections.sort(terms, comparator);
            return terms;
        }