X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/afd232b8a927cfecf45a9b0e33d95d924db56700..53a122e48e7f0fe69c6283f7f1a3edbf4699e6f3:/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
index 310c39c99..5c823e58e 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
@@ -23,7 +23,8 @@ import eu.etaxonomy.cdm.api.service.DeleteResult;
 import eu.etaxonomy.cdm.api.service.ICollectionService;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
-import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
+import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.common.Annotation;
@@ -38,6 +39,7 @@ import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.view.AuditEvent;
 import eu.etaxonomy.cdm.model.view.AuditEventRecord;
 import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort;
+import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.Grouping;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
@@ -59,7 +61,7 @@ public class TransientCollectionService implements ICollectionService {
      * @see eu.etaxonomy.cdm.api.service.IService#save(eu.etaxonomy.cdm.model.common.ICdmBase)
      */
     @Override
-    public UUID save(Collection newInstance) {
+    public Collection save(Collection newInstance) {
         return null;
     }
 
@@ -415,15 +417,6 @@ public class TransientCollectionService implements ICollectionService {
         return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
     }
 
-    /**
-     * @return
-     * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#getUuidAndTitleCache()
-     */
-    @Override
-    public List<UuidAndTitleCache<Collection>> getUuidAndTitleCache() {
-        return defaultService.getUuidAndTitleCache();
-    }
-
     /**
      * @param clazz
      * @param queryString
@@ -700,7 +693,88 @@ public class TransientCollectionService implements ICollectionService {
     }
 
 	@Override
-	public <S extends Collection>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
+	public <S extends Collection>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
 		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 	}
+
+
+	@Override
+	public DeleteResult delete(UUID arg0) {
+		return defaultService.delete(arg0);
+	}
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.Collection)
+     */
+    @Override
+    public DeleteResult delete(java.util.Collection<UUID> arg0) {
+        return defaultService.delete(arg0);
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
+     */
+    @Override
+    public List<Collection> merge(List<Collection> arg0) {
+        return defaultService.merge(arg0);
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
+     */
+    @Override
+    public List<MergeResult<Collection>> merge(List<Collection> arg0, boolean arg1) {
+        return defaultService.merge(arg0, arg1);
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
+     */
+    @Override
+    public MergeResult<Collection> merge(Collection arg0, boolean arg1) {
+        return defaultService.merge(arg0, arg1);
+    }
+
+    @Override
+    public Collection loadWithUpdate(UUID arg0) {
+        return defaultService.loadWithUpdate(arg0);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<Collection> load(List<UUID> arg0, List<String> arg1) {
+        return defaultService.load(arg0, arg1);
+    }
+
+	@Override
+	public List<UuidAndTitleCache<Collection>> getUuidAndTitleCache(
+			Integer limit, String pattern) {
+		return defaultService.getUuidAndTitleCache(limit, pattern);
+	}
+
+	@Override
+	public List<Collection> loadByIds(List<Integer> idSet, List<String> propertyPaths) {
+		
+		return defaultService.loadByIds(idSet, propertyPaths);
+	}
+
+	@Override
+	public <S extends Collection> Pager<MarkedEntityDTO<S>> findByMarker(
+			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+			Integer arg4, Integer arg5, List<String> arg6) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public <S extends Collection> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+			Class<S> arg0, Integer arg1, String arg2) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+
 }