From 8a8143910519db5dd4b91036f707dd1c9302c4ca Mon Sep 17 00:00:00 2001
From: "a.babadshanjan" <a.babadshanjan@localhost>
Date: Wed, 18 Feb 2009 16:06:10 +0000
Subject: [PATCH] Ticket #602: Implemented
 INameService.getTypeDesignationStatusVocabulary()

---
 .../cdm/api/service/INameService.java         | 40 ++++++++++---------
 .../cdm/api/service/NameServiceImpl.java      | 36 ++++++++++++-----
 2 files changed, 48 insertions(+), 28 deletions(-)

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 52f54e27e2..aaf93672ed 100644
--- 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
 	 * @return
 	 */
-	public abstract TaxonNameBase getTaxonNameByUuid(UUID uuid);
+	public TaxonNameBase getTaxonNameByUuid(UUID uuid);
 
 	/**
 	 * FIXME candidate for harmonization?
 	 * @param taxonName
 	 * @return
 	 */
-	public abstract UUID saveTaxonName(TaxonNameBase taxonName);
+	public UUID saveTaxonName(TaxonNameBase taxonName);
 
 	/**
 	 * FIXME candidate for harmonization?
 	 * Saves a collection of  TaxonNames and return its UUID@param taxonCollection
 	 * @return
 	 */
-	public abstract Map<UUID, TaxonNameBase> saveTaxonNameAll(Collection<? extends TaxonNameBase> taxonCollection);
+	public Map<UUID, TaxonNameBase> saveTaxonNameAll(Collection<? extends TaxonNameBase> taxonCollection);
 
 	public Map<UUID, TypeDesignationBase> saveTypeDesignationAll(Collection<TypeDesignationBase> typeDesignationCollection);
 
@@ -57,53 +57,57 @@ public interface INameService extends IIdentifiableEntityService<TaxonNameBase>
 	 * @param start
 	 * @return
 	 */
-	public abstract List<TaxonNameBase> getAllNames(int limit, int start);
+	public List<TaxonNameBase> getAllNames(int limit, int start);
 
-	public abstract List<NomenclaturalStatus> getAllNomenclaturalStatus(int limit, int start);
+	public List<NomenclaturalStatus> getAllNomenclaturalStatus(int limit, int start);
 
-	public abstract List<TypeDesignationBase> getAllTypeDesignations(int limit, int start);
+	public List<TypeDesignationBase> getAllTypeDesignations(int limit, int start);
 	
 	/**
 	 * @param name
 	 * @return
 	 */
-	public abstract List<TaxonNameBase> getNamesByName(String name);
+	public List<TaxonNameBase> getNamesByName(String name);
 
 	/**
 	 * @param name
 	 * @param sessionObject An object that is attached to the session before executing the query
 	 * @return
 	 */
-	public abstract List getNamesByName(String name, CdmBase sessionObject);
+	public List getNamesByName(String name, CdmBase sessionObject);
 	
 	// TODO: Remove getNamesByName() methods. Use findNamesByTitle() instead.
 	
 	// FIXME candidate for harmonization?
-	public abstract List findNamesByTitle(String title);
+	public List findNamesByTitle(String title);
 	
-	public abstract List findNamesByTitle(String title, CdmBase sessionObject);
+	public List findNamesByTitle(String title, CdmBase sessionObject);
 	
 	public List<HomotypicalGroup> getAllHomotypicalGroups(int limit, int start);
 
 	/**
-	 * Returns all Ranks.
+	 * Returns all Ranks
 	 * @return
 	 */
-	public abstract OrderedTermVocabulary<Rank> getRankVocabulary();
+	public OrderedTermVocabulary<Rank> getRankVocabulary();
 	
-
 	/**
-	 * Returns all NomenclaturalStatusTypes.
+	 * Returns all NomenclaturalStatusTypes
 	 * @return
 	 */
-	public abstract TermVocabulary<NomenclaturalStatusType> getStatusTypeVocabulary();
-	
+	public TermVocabulary<NomenclaturalStatusType> getStatusTypeVocabulary();
 	
 	/**
-	 * Returns all NameRelationshipTypes.
+	 * Returns all TypeDesignationStatus
+	 * @return
+	 */
+	public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatusVocabulary();
+		
+	/**
+	 * Returns all NameRelationshipTypes
 	 * @return
 	 */
-	public abstract TermVocabulary<NameRelationshipType> getNameRelationshipTypeVocabulary();
+	public TermVocabulary<NameRelationshipType> getNameRelationshipTypeVocabulary();
 	
 	/**
 	 * Return a List of relationships related to this name, optionally filtered 
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 6301d4716c..d781f8c0fb 100644
--- 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);
 	}
 	
+	/* (non-Javadoc)
+	 * @see eu.etaxonomy.cdm.api.service.INameService#getRankVocabulary()
+	 */
 	public OrderedTermVocabulary<Rank> getRankVocabulary() {
-		String uuidRank = "ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b";
-		UUID rankUuid = UUID.fromString(uuidRank);
-		OrderedTermVocabulary<Rank> rankVocabulary = (OrderedTermVocabulary)orderedVocabularyDao.findByUuid(rankUuid);
+		String uuidString = "ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b";
+		UUID uuid = UUID.fromString(uuidString);
+		OrderedTermVocabulary<Rank> rankVocabulary = 
+			(OrderedTermVocabulary)orderedVocabularyDao.findByUuid(uuid);
 		return rankVocabulary;
 	}
 
-	
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.cdm.api.service.INameService#getNameRelationshipTypeVocabulary()
 	 */
 	public TermVocabulary<NameRelationshipType> getNameRelationshipTypeVocabulary() {
-		String uuidRank = "6878cb82-c1a4-4613-b012-7e73b413c8cd";
-		UUID rankUuid = UUID.fromString(uuidRank);
-		TermVocabulary<NameRelationshipType> nameRelTypeVocabulary = (TermVocabulary)vocabularyDao.findByUuid(rankUuid);
+		String uuidString = "6878cb82-c1a4-4613-b012-7e73b413c8cd";
+		UUID uuid = UUID.fromString(uuidString);
+		TermVocabulary<NameRelationshipType> nameRelTypeVocabulary = 
+			(TermVocabulary)vocabularyDao.findByUuid(uuid);
 		return nameRelTypeVocabulary;
 	}
 
@@ -166,12 +170,24 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
 	 * @see eu.etaxonomy.cdm.api.service.INameService#getStatusTypeVocabulary()
 	 */
 	public TermVocabulary<NomenclaturalStatusType> getStatusTypeVocabulary() {
-		String uuidRank = "bb28cdca-2f8a-4f11-9c21-517e9ae87f1f";
-		UUID rankUuid = UUID.fromString(uuidRank);
-		TermVocabulary<NomenclaturalStatusType> nomStatusTypeVocabulary = (TermVocabulary)vocabularyDao.findByUuid(rankUuid);
+		String uuidString = "bb28cdca-2f8a-4f11-9c21-517e9ae87f1f";
+		UUID uuid = UUID.fromString(uuidString);
+		TermVocabulary<NomenclaturalStatusType> nomStatusTypeVocabulary = 
+			(TermVocabulary)vocabularyDao.findByUuid(uuid);
 		return nomStatusTypeVocabulary;
 	}
 
+	/* (non-Javadoc)
+	 * @see eu.etaxonomy.cdm.api.service.INameService#getTypeDesignationStatusVocabulary()
+	 */
+	public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatusVocabulary() {
+		String uuidString = "ab177bd7-d3c8-4e58-a388-226fff6ba3c2";
+		UUID uuid = UUID.fromString(uuidString);
+		TermVocabulary<TypeDesignationStatus> typeDesigStatusVocabulary = 
+			(TermVocabulary)vocabularyDao.findByUuid(uuid);
+		return null;
+	}
+	
 	public void generateTitleCache() {
 		logger.warn("Not yet implemented");
 		// TODO Auto-generated method stub
-- 
2.34.1