adapt TransientNameService

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index b1c12d16b8919a8071896a902794bfd3dd1ea12b..759e214c5996764f59be66692e77bac0c4142e6d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@ -41,11 +41,9 @@ import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
@@ -54,7 +52,6 @@ import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
@@ -854,17 +851,6 @@ public class TransientNameService implements INameService {
         return defaultNameService.getAllRelationships(limit, start);
     }
 
-    /**
-     * @return
-     * @deprecated
-     * @see eu.etaxonomy.cdm.api.service.INameService#getRankVocabulary()
-     */
-    @Deprecated
-    @Override
-    public OrderedTermVocabulary<Rank> getRankVocabulary() {
-        return defaultNameService.getRankVocabulary();
-    }
-
     /**
      * @param transientObjects
      * @return
@@ -875,17 +861,6 @@ public class TransientNameService implements INameService {
         return null;
     }
 
-    /**
-     * @return
-     * @deprecated
-     * @see eu.etaxonomy.cdm.api.service.INameService#getStatusTypeVocabulary()
-     */
-    @Deprecated
-    @Override
-    public TermVocabulary<NomenclaturalStatusType> getStatusTypeVocabulary() {
-        return defaultNameService.getStatusTypeVocabulary();
-    }
-
     /**
      * @param transientObject
      * @return
@@ -896,17 +871,6 @@ public class TransientNameService implements INameService {
         return defaultNameService.update(transientObject);
     }
 
-    /**
-     * @return
-     * @deprecated
-     * @see eu.etaxonomy.cdm.api.service.INameService#getSpecimenTypeDesignationStatusVocabulary()
-     */
-    @Deprecated
-    @Override
-    public TermVocabulary<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationStatusVocabulary() {
-        return defaultNameService.getSpecimenTypeDesignationStatusVocabulary();
-    }
-
     /**
      * @param example
      * @param includeProperties
@@ -922,28 +886,6 @@ public class TransientNameService implements INameService {
         return defaultNameService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
     }
 
-    /**
-     * @return
-     * @deprecated
-     * @see eu.etaxonomy.cdm.api.service.INameService#getSpecimenTypeDesignationVocabulary()
-     */
-    @Deprecated
-    @Override
-    public OrderedTermVocabulary<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationVocabulary() {
-        return defaultNameService.getSpecimenTypeDesignationVocabulary();
-    }
-
-    /**
-     * @return
-     * @deprecated
-     * @see eu.etaxonomy.cdm.api.service.INameService#getNameRelationshipTypeVocabulary()
-     */
-    @Deprecated
-    @Override
-    public TermVocabulary<NameRelationshipType> getNameRelationshipTypeVocabulary() {
-        return defaultNameService.getNameRelationshipTypeVocabulary();
-    }
-
     /**
      * @param clazz
      * @param matchStrategy