Ticket #602: Implemented INameService.getTypeDesignationStatusVocabulary()

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
index 52f54e27e2a7b66765c98547890fe5e031697228..aaf93672edff594e99ca4b335edcc079df73557c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
@@ -29,21 +29,21 @@ public interface INameService extends IIdentifiableEntityService<TaxonNameBase>
         * @param uuid\r
         * @return\r
         */\r
-       public abstract TaxonNameBase getTaxonNameByUuid(UUID uuid);\r
+       public TaxonNameBase getTaxonNameByUuid(UUID uuid);\r
 \r
        /**\r
         * FIXME candidate for harmonization?\r
         * @param taxonName\r
         * @return\r
         */\r
-       public abstract UUID saveTaxonName(TaxonNameBase taxonName);\r
+       public UUID saveTaxonName(TaxonNameBase taxonName);\r
 \r
        /**\r
         * FIXME candidate for harmonization?\r
         * Saves a collection of  TaxonNames and return its UUID@param taxonCollection\r
         * @return\r
         */\r
-       public abstract Map<UUID, TaxonNameBase> saveTaxonNameAll(Collection<? extends TaxonNameBase> taxonCollection);\r
+       public Map<UUID, TaxonNameBase> saveTaxonNameAll(Collection<? extends TaxonNameBase> taxonCollection);\r
 \r
        public Map<UUID, TypeDesignationBase> saveTypeDesignationAll(Collection<TypeDesignationBase> typeDesignationCollection);\r
 \r
@@ -57,53 +57,57 @@ public interface INameService extends IIdentifiableEntityService<TaxonNameBase>
         * @param start\r
         * @return\r
         */\r
-       public abstract List<TaxonNameBase> getAllNames(int limit, int start);\r
+       public List<TaxonNameBase> getAllNames(int limit, int start);\r
 \r
-       public abstract List<NomenclaturalStatus> getAllNomenclaturalStatus(int limit, int start);\r
+       public List<NomenclaturalStatus> getAllNomenclaturalStatus(int limit, int start);\r
 \r
-       public abstract List<TypeDesignationBase> getAllTypeDesignations(int limit, int start);\r
+       public List<TypeDesignationBase> getAllTypeDesignations(int limit, int start);\r
        \r
        /**\r
         * @param name\r
         * @return\r
         */\r
-       public abstract List<TaxonNameBase> getNamesByName(String name);\r
+       public List<TaxonNameBase> getNamesByName(String name);\r
 \r
        /**\r
         * @param name\r
         * @param sessionObject An object that is attached to the session before executing the query\r
         * @return\r
         */\r
-       public abstract List getNamesByName(String name, CdmBase sessionObject);\r
+       public List getNamesByName(String name, CdmBase sessionObject);\r
        \r
        // TODO: Remove getNamesByName() methods. Use findNamesByTitle() instead.\r
        \r
        // FIXME candidate for harmonization?\r
-       public abstract List findNamesByTitle(String title);\r
+       public List findNamesByTitle(String title);\r
        \r
-       public abstract List findNamesByTitle(String title, CdmBase sessionObject);\r
+       public List findNamesByTitle(String title, CdmBase sessionObject);\r
        \r
        public List<HomotypicalGroup> getAllHomotypicalGroups(int limit, int start);\r
 \r
        /**\r
-        * Returns all Ranks.\r
+        * Returns all Ranks\r
         * @return\r
         */\r
-       public abstract OrderedTermVocabulary<Rank> getRankVocabulary();\r
+       public OrderedTermVocabulary<Rank> getRankVocabulary();\r
        \r
-\r
        /**\r
-        * Returns all NomenclaturalStatusTypes.\r
+        * Returns all NomenclaturalStatusTypes\r
         * @return\r
         */\r
-       public abstract TermVocabulary<NomenclaturalStatusType> getStatusTypeVocabulary();\r
-       \r
+       public TermVocabulary<NomenclaturalStatusType> getStatusTypeVocabulary();\r
        \r
        /**\r
-        * Returns all NameRelationshipTypes.\r
+        * Returns all TypeDesignationStatus\r
+        * @return\r
+        */\r
+       public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatusVocabulary();\r
+               \r
+       /**\r
+        * Returns all NameRelationshipTypes\r
         * @return\r
         */\r
-       public abstract TermVocabulary<NameRelationshipType> getNameRelationshipTypeVocabulary();\r
+       public TermVocabulary<NameRelationshipType> getNameRelationshipTypeVocabulary();\r
        \r
        /**\r
         * Return a List of relationships related to this name, optionally filtered \r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
index 6301d4716ce275d99f7f2959ff7edf2a30cc0569..d781f8c0fbeaaea1886ffcc45f6d1b69a39b7266 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
@@ -144,21 +144,25 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
                return homotypicalGroupDao.list(limit, start);\r
        }\r
        \r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.api.service.INameService#getRankVocabulary()\r
+        */\r
        public OrderedTermVocabulary<Rank> getRankVocabulary() {\r
-               String uuidRank = "ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b";\r
-               UUID rankUuid = UUID.fromString(uuidRank);\r
-               OrderedTermVocabulary<Rank> rankVocabulary = (OrderedTermVocabulary)orderedVocabularyDao.findByUuid(rankUuid);\r
+               String uuidString = "ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b";\r
+               UUID uuid = UUID.fromString(uuidString);\r
+               OrderedTermVocabulary<Rank> rankVocabulary = \r
+                       (OrderedTermVocabulary)orderedVocabularyDao.findByUuid(uuid);\r
                return rankVocabulary;\r
        }\r
 \r
-       \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.service.INameService#getNameRelationshipTypeVocabulary()\r
         */\r
        public TermVocabulary<NameRelationshipType> getNameRelationshipTypeVocabulary() {\r
-               String uuidRank = "6878cb82-c1a4-4613-b012-7e73b413c8cd";\r
-               UUID rankUuid = UUID.fromString(uuidRank);\r
-               TermVocabulary<NameRelationshipType> nameRelTypeVocabulary = (TermVocabulary)vocabularyDao.findByUuid(rankUuid);\r
+               String uuidString = "6878cb82-c1a4-4613-b012-7e73b413c8cd";\r
+               UUID uuid = UUID.fromString(uuidString);\r
+               TermVocabulary<NameRelationshipType> nameRelTypeVocabulary = \r
+                       (TermVocabulary)vocabularyDao.findByUuid(uuid);\r
                return nameRelTypeVocabulary;\r
        }\r
 \r
@@ -166,12 +170,24 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
         * @see eu.etaxonomy.cdm.api.service.INameService#getStatusTypeVocabulary()\r
         */\r
        public TermVocabulary<NomenclaturalStatusType> getStatusTypeVocabulary() {\r
-               String uuidRank = "bb28cdca-2f8a-4f11-9c21-517e9ae87f1f";\r
-               UUID rankUuid = UUID.fromString(uuidRank);\r
-               TermVocabulary<NomenclaturalStatusType> nomStatusTypeVocabulary = (TermVocabulary)vocabularyDao.findByUuid(rankUuid);\r
+               String uuidString = "bb28cdca-2f8a-4f11-9c21-517e9ae87f1f";\r
+               UUID uuid = UUID.fromString(uuidString);\r
+               TermVocabulary<NomenclaturalStatusType> nomStatusTypeVocabulary = \r
+                       (TermVocabulary)vocabularyDao.findByUuid(uuid);\r
                return nomStatusTypeVocabulary;\r
        }\r
 \r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.api.service.INameService#getTypeDesignationStatusVocabulary()\r
+        */\r
+       public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatusVocabulary() {\r
+               String uuidString = "ab177bd7-d3c8-4e58-a388-226fff6ba3c2";\r
+               UUID uuid = UUID.fromString(uuidString);\r
+               TermVocabulary<TypeDesignationStatus> typeDesigStatusVocabulary = \r
+                       (TermVocabulary)vocabularyDao.findByUuid(uuid);\r
+               return null;\r
+       }\r
+       \r
        public void generateTitleCache() {\r
                logger.warn("Not yet implemented");\r
                // TODO Auto-generated method stub\r