X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/fcb1fc89f42addb1195896f9b31045f04b3c8fd8..03573c63c3935a248a68722e7122460e525abbbb:/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAgentService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAgentService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAgentService.java
index 1c226784ea..85e739f59b 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAgentService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAgentService.java
@@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
+import eu.etaxonomy.cdm.persistence.dto.TeamOrPersonUuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 import eu.etaxonomy.cdm.strategy.merge.MergeException;
@@ -76,21 +77,6 @@ public interface IAgentService extends IIdentifiableEntityService<AgentBase> {
 	@Override
     public Pager<AgentBase> search(Class<? extends AgentBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths);
 
-	/**
-	 * Returns a list of <code>UuidAndTitleCache</code> containing all <code>Person</code>s
-	 *
-	 * @return a list of <code>UuidAndTitleCache</code> instances
-	 */
-	public List<UuidAndTitleCache<Person>> getPersonUuidAndTitleCache();
-
-	/**
-	 * Returns a list of <code>UuidAndTitleCache</code> containing all <code>TeamOrPersonBase</code> objects
-	 * with their respective titleCache
-	 *
-	 * @return a list of <code>UuidAndTitleCache</code> instances
-	 */
-	public List<UuidAndTitleCache<Team>> getTeamUuidAndTitleCache();
-
 	/**
 	 * Returns a list of <code>UuidAndTitleCache</code> containing all <code>TeamOrPersonBase</code> objects
 	 * with their respective nomenclaturalTitle instead of regular titleCache
@@ -99,27 +85,31 @@ public interface IAgentService extends IIdentifiableEntityService<AgentBase> {
 	 */
 	public List<UuidAndTitleCache<Team>> getTeamUuidAndNomenclaturalTitle();
 
-	/**
-	 * Returns a list of <code>UuidAndTitleCache</code> containing all {@link Institution} objects
-	 * with their respective titleCache
-	 *
-	 * @return a list of <code>UuidAndTitleCache</code> instances
-	 */
-	public List<UuidAndTitleCache<Institution>> getInstitutionUuidAndTitleCache(Integer limit, String pattern);
-
 	/**
      * Returns a list of <code>UuidAndTitleCache</code> containing all {@link Institution} objects
      * with their respective NomenclaturalTitleCache
      *
      * @return a list of <code>UuidAndTitleCache</code> instances
      */
-    public <T extends AgentBase> List<UuidAndTitleCache<T>> getUuidAndAbbrevTitleCache(Class<T> clazz, Integer limit, String pattern);
+    public <T extends AgentBase> List<TeamOrPersonUuidAndTitleCache<T>> getUuidAndAbbrevTitleCache(Class<T> clazz, Integer limit, String pattern);
 
     /**
-     * @param teamUuid
-     * @return
-     * @throws MergeException
+     * Returns a list of <code>UuidAndTitleCache</code> containing all {@link Institution} objects
+     * with their respectiveCollectorTitleCache
+     *
+     * @return a list of <code>UuidAndTitleCache</code> instances
+     */
+    public <T extends AgentBase> List<TeamOrPersonUuidAndTitleCache<T>> getUuidAndTitleCacheWithCollectorTitleCache(Class<T> clazz, Integer limit, String pattern);
+
+    /**
+     * Returns a list of <code>UuidAndTitleCache</code> containing all {@link Institution} objects
+     * with their respectiveCollectorTitleCache
+     *
+     * @return a list of <code>UuidAndTitleCache</code> instances
      */
+    public <T extends AgentBase> List<TeamOrPersonUuidAndTitleCache<T>> getTeamOrPersonUuidAndTitleCache(Class<T> clazz, Integer limit, String pattern);
+
+
     public UpdateResult convertTeam2Person(UUID teamUuid) throws MergeException;
 
 	/**